Merge branch 'feature/utf8mb4' of github.com:nikosdion/joomla-cms int…

…o feature/utf8mb4

libraries/joomla/filter/input.php

@@ -231,7 +231,7 @@ public function clean($source, $type = 'string')
 		if ($this->stripUSC)
 		{
 			// Alternatively: preg_replace('/[\x{10000}-\x{10FFFF}]/u', "\xE2\xAF\x91", $source) but it'd be slower.
-			$source = preg_replace('/[\xF0-\xF7].../s', "\xE2\xAF\x91", $source);
+			$source = $this->stripUSC($source);
 		}
 
 		// Handle the type constraint
@@ -1128,4 +1128,33 @@ protected function _stripCSSExpressions($source)
 
 		return $return;
 	}
+
+	/**
+	 * Recursively strip Unicode Supplementary Characters from the source. Not: objects cannot be filtered.
+	 *
+	 * @param   mixed  $source  The data to filter
+	 *
+	 * @return  mixed  The filtered result
+	 */
+	protected function stripUSC($source)
+	{
+		if (is_object($source))
+		{
+			return $source;
+		}
+
+		if (is_array($source))
+		{
+			$filteredArray = array();
+
+			foreach ($source as $k => $v)
+			{
+				$filteredArray[$k] = $this->stripUSC($v);
+			}
+
+			return $filteredArray;
+		}
+
+		return preg_replace('/[\xF0-\xF7].../s', "\xE2\xAF\x91", $source);
+	}
 }