<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre, #msg p { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[12052] trunk:
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.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12052">12052</a></dd>
<dt>Author</dt> <dd>westi</dd>
<dt>Date</dt> <dd>2009-10-18 11:50:59 +0000 (Sun, 18 Oct 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminadminajaxphp">trunk/wp-admin/admin-ajax.php</a></li>
<li><a href="#trunkwpincludesfunctionsphp">trunk/wp-includes/functions.php</a></li>
<li><a href="#trunkwpincludesqueryphp">trunk/wp-includes/query.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminadminajaxphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/admin-ajax.php (12051 => 12052)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/admin-ajax.php 2009-10-18 06:14:16 UTC (rev 12051)
+++ trunk/wp-admin/admin-ajax.php 2009-10-18 11:50:59 UTC (rev 12052)
</span><span class="lines">@@ -1197,7 +1197,7 @@
</span><span class="cx"> $what = isset($_POST['pages']) ? 'page' : 'post';
</span><span class="cx"> $s = stripslashes($_POST['ps']);
</span><span class="cx"> preg_match_all('/".*?("|$)|((?<=[\\s",+])|^)[^\\s",+]+/', $s, $matches);
</span><del>- $search_terms = array_map(create_function('$a', 'return trim($a, "\\"\'\\n\\r ");'), $matches[0]);
</del><ins>+ $search_terms = array_map('_search_terms_tidy', $matches[0]);
</ins><span class="cx">
</span><span class="cx"> $searchand = $search = '';
</span><span class="cx"> foreach( (array) $search_terms as $term) {
</span></span></pre></div>
<a id="trunkwpincludesfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/functions.php (12051 => 12052)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/functions.php 2009-10-18 06:14:16 UTC (rev 12051)
+++ trunk/wp-includes/functions.php 2009-10-18 11:50:59 UTC (rev 12052)
</span><span class="lines">@@ -3479,4 +3479,13 @@
</span><span class="cx">
</span><span class="cx"> return $file_data;
</span><span class="cx"> }
</span><ins>+/*
+ * Used internally to tidy up the search terms
+ *
+ * @private
+ * @since 2.9.0
+ */
+function _search_terms_tidy($t) {
+ return trim($t, "\"\'\n\r ");
+}
</ins><span class="cx"> ?>
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpincludesqueryphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/query.php (12051 => 12052)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/query.php 2009-10-18 06:14:16 UTC (rev 12051)
+++ trunk/wp-includes/query.php 2009-10-18 11:50:59 UTC (rev 12052)
</span><span class="lines">@@ -1747,7 +1747,7 @@
</span><span class="cx"> $q['search_terms'] = array($q['s']);
</span><span class="cx"> } else {
</span><span class="cx"> preg_match_all('/".*?("|$)|((?<=[\\s",+])|^)[^\\s",+]+/', $q['s'], $matches);
</span><del>- $q['search_terms'] = array_map(create_function('$a', 'return trim($a, "\\"\'\\n\\r ");'), $matches[0]);
</del><ins>+ $q['search_terms'] = array_map('_search_terms_tidy', $matches[0]);
</ins><span class="cx"> }
</span><span class="cx"> $n = !empty($q['exact']) ? '' : '%';
</span><span class="cx"> $searchand = '';
</span></span></pre>
</div>
</div>
</body>
</html>