Changeset 12052

Timestamp:

10/18/2009 11:50:59 AM (14 years ago)

Author:

westi

Message:

Remove duplicated create_function calls an use a private _search_terms_tidy function instead for tidying up the post/page searching when looking to attach orphans to a parent post or page.

Location:

trunk

Files:

• wp-admin/admin-ajax.php (modified) (1 diff)
• wp-includes/functions.php (modified) (1 diff)
• wp-includes/query.php (modified) (1 diff)

trunk/wp-admin/admin-ajax.php

@@ -1198 +1198 @@
     $s = stripslashes($_POST['ps']);
     preg_match_all('/".*?("|$)|((?<=[\\s",+])|^)[^\\s",+]+/', $s, $matches);
-    $search_terms = array_map(create_function('$a', 'return trim($a, "\\"\'\\n\\r ");'), $matches[0]);
+    $search_terms = array_map('_search_terms_tidy', $matches[0]);
 
     $searchand = $search = '';

trunk/wp-includes/functions.php

@@ -3480 +3480 @@
     return $file_data;
 }
+/*
+ * Used internally to tidy up the search terms
+ * 
+ * @private
+ * @since 2.9.0
+ */
+function _search_terms_tidy($t) {
+    return trim($t, "\"\'\n\r ");
+}
 ?>

trunk/wp-includes/query.php

@@ -1748 +1748 @@
             } else {
                 preg_match_all('/".*?("|$)|((?<=[\\s",+])|^)[^\\s",+]+/', $q['s'], $matches);
-                $q['search_terms'] = array_map(create_function('$a', 'return trim($a, "\\"\'\\n\\r ");'), $matches[0]);
+                $q['search_terms'] = array_map('_search_terms_tidy', $matches[0]);
             }
             $n = !empty($q['exact']) ? '' : '%';