merge from 1.5.3.2(r11162 ~ r11201)

and from luminous (r11141 ~ r11193)

git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@11202 201d5d3c-b55e-5fd7-737f-ddc643e51545

classes/xml/xmlquery/argument/Argument.class.php

@@ -163,11 +163,50 @@ class Argument {
 	 * @return string
 	 */
 	function _escapeStringValue($value) {
+		// Remove non-utf8 chars.
+		$regex = <<<'END'
+/
+(
+	(?:
+		[\x00-\x7F]					# single-byte sequences   0xxxxxxx
+		|[\xC0-\xDF][\x80-\xBF]		# double-byte sequences   110xxxxx 10xxxxxx
+		|[\xE0-\xEF][\x80-\xBF]{2}	# triple-byte sequences   1110xxxx 10xxxxxx * 2
+	)+
+)
+|([\xF0-\xF7][\x80-\xBF]{3})			# quadruple-byte sequence 11110xxx 10xxxxxx * 3 
+|([\x80-\xBF])							# invalid byte in range 10000000 - 10111111
+|([\xC0-\xFF])							# invalid byte in range 11000000 - 11111111
+/x
+END;
+
+		$value = preg_replace_callback($regex, array($this, 'utf8Replacer'), $value);
 		$db = &DB::getInstance();
 		$value = $db->addQuotes($value);
 		return '\'' . $value . '\'';
 	}
 
+	function utf8Replacer($captures) {
+		if (!empty($captures[1]))
+		{
+			// Valid byte sequence. Return unmodified.
+			return $captures[1];
+		}
+		elseif(!empty($captures[2]))
+		{
+			// Remove user defined area
+			if("\xF3\xB0\x80\x80" <= $captures[2])
+			{
+				return;
+			}
+
+			return $captures[2];
+		}
+		else
+		{
+			return;
+		}
+	}
+
 	function isValid() {
 		return $this->isValid;
 	}