Update phpQueryObject.php

Added charset check to parseSelector
phpquery · Apr 15, 2014 · 0018074 · 0018074
1 parent 00d30fc
commit 0018074
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/phpQuery/phpQuery/phpQueryObject.php b/phpQuery/phpQuery/phpQueryObject.php
@@ -311,9 +311,10 @@ protected function isChar($char) {
 	protected function parseSelector($query) {
 		// clean spaces
 		// TODO include this inside parsing ?
+		$modifier = strtolower(str_replace('-', '', $this->charset)) == 'utf8' ? 'u' : '';
 		$query = trim(
-			preg_replace('@\s+@u', ' ',
-				preg_replace('@\s*(>|\\+|~)\s*@u', '\\1', $query)
+			preg_replace('@\s+@' . $modifier, ' ',
+				preg_replace('@\s*(>|\\+|~)\s*@' . $modifier, '\\1', $query)
 			)
 		);
 		$queries = array(array());