Ticket #20352: 20352.diff

wp-includes/compat.php

@@ -94 +94 @@
                 return is_array($data) ? array_map(__FUNCTION__, $data) : $data;
         }
 }
+
+if ( !function_exists( 'str_getcsv' ) ) {
+        function str_getcsv( $input, $delimiter = ',', $enclosure = '"', $escape = "\\" ) {
+                $fp = fopen( 'php://temp/', 'r+' );
+                fputs( $fp, $input );
+                rewind( $fp );
+                $data = fgetcsv( $fp, strlen( $input ), $delimiter, $enclosure );
+                fclose( $fp );
+                return $data;
+        }
+}
+

wp-includes/functions.php

@@ -3399 +3399 @@
 }
 
 /**
- * Used internally to tidy up the search terms.
- *
- * @access private
- * @since 2.9.0
- *
- * @param string $t
- * @return string
- */
-function _search_terms_tidy($t) {
-        return trim($t, "\"'\n\r ");
-}
-
-/**
  * Returns true.
  *
  * Useful for returning true to filters easily.

wp-includes/query.php

@@ -2180 +2180 @@
                         if ( !empty($q['sentence']) ) {
                                 $q['search_terms'] = array($q['s']);
                         } else {
-                                preg_match_all('/".*?("|$)|((?<=[\r\n\t ",+])|^)[^\r\n\t ",+]+/', $q['s'], $matches);
-                                $q['search_terms'] = array_map('_search_terms_tidy', $matches[0]);
+                                $q['search_terms'] = array_filter( str_getcsv( $q['s'], ' ' ) );
                         }
                         $n = !empty($q['exact']) ? '' : '%';
                         $searchand = '';