Index: t3lib/class.t3lib_div.php
===================================================================
--- t3lib/class.t3lib_div.php	(revision 9811)
+++ t3lib/class.t3lib_div.php	(working copy)
@@ -6243,14 +6243,13 @@
 			if ($quoteActive > -1) {
 				$paramsArr[$quoteActive] .= ' ' . $v;
 				unset($paramsArr[$k]);
-				if (preg_match('/"$/', $v)) {
+				if (substr($v, -1) === $paramsArr[$quoteActive][0]) {
 					$quoteActive = -1;
 				}
-
 			} elseif (!trim($v)) {
 				unset($paramsArr[$k]); // Remove empty elements
 
-			} elseif (preg_match('/^"/', $v)) {
+			} elseif (preg_match('/^(["\'])/', $v) && substr($v, -1) !== $v[0]) {
 				$quoteActive = $k;
 			}
 		}
@@ -6258,6 +6257,8 @@
 		if ($unQuote) {
 			foreach ($paramsArr as $key => &$val) {
 				$val = preg_replace('/(^"|"$)/', '', $val);
+				$val = preg_replace('/(^\'|\'$)/', '', $val);
+
 			}
 		}
 			// return reindexed array
@@ -6331,4 +6332,4 @@
 	}
 }
 
-?>
+?>
\ No newline at end of file