Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2025-01-22 08:11:52 +01:00
Code Issues Projects Releases Wiki Activity

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.

Browse Source 
git-svn-id: http://svn.automattic.com/wordpress/trunk@12052 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
westi 2009-10-18 11:50:59 +00:00
parent 9783a2415a
commit 04638ecd6f
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-admin/admin-ajax.php
View File

@ -1197,7 +1197,7 @@ case 'find_posts':
$what = isset($_POST['pages']) ? 'page' : 'post'; $what = isset($_POST['pages']) ? 'page' : 'post';
$s = stripslashes($_POST['ps']); $s = stripslashes($_POST['ps']);
preg_match_all('/".*?("|$)|((?<=[\\s",+])|^)[^\\s",+]+/', $s, $matches); 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 = ''; $searchand = $search = '';
foreach( (array) $search_terms as $term) { foreach( (array) $search_terms as $term) {

9
wp-includes/functions.php
View File

@ -3479,4 +3479,13 @@ function get_file_data( $file, $default_headers, $context = '' ) {
return $file_data; 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 ");
}
?> ?>

2
wp-includes/query.php
View File

@ -1747,7 +1747,7 @@ class WP_Query {
$q['search_terms'] = array($q['s']); $q['search_terms'] = array($q['s']);
} else { } else {
preg_match_all('/".*?("|$)|((?<=[\\s",+])|^)[^\\s",+]+/', $q['s'], $matches); 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']) ? '' : '%'; $n = !empty($q['exact']) ? '' : '%';
$searchand = ''; $searchand = '';