<!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>[12062] trunk/wp-includes: Improve sanitize_post() performance.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12062">12062</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2009-10-19 21:28:44 +0000 (Mon, 19 Oct 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Improve sanitize_post() performance. Perform raw filtering only once. Add filter check to eliminate double filtering. Props johanee. fixes <a href="http://trac.wordpress.org/ticket/10972">#10972</a> see <a href="http://trac.wordpress.org/ticket/10801">#10801</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludespostphp">trunk/wp-includes/post.php</a></li>
<li><a href="#trunkwpincludesqueryphp">trunk/wp-includes/query.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/post.php (12061 => 12062)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post.php 2009-10-19 21:10:46 UTC (rev 12061)
+++ trunk/wp-includes/post.php 2009-10-19 21:28:44 UTC (rev 12062)
</span><span class="lines">@@ -232,8 +232,8 @@
</span><span class="cx"> return $null;
</span><span class="cx"> } elseif ( is_object($post) && empty($post->filter) ) {
</span><span class="cx"> _get_post_ancestors($post);
</span><del>- wp_cache_add($post->ID, $post, 'posts');
- $_post = &$post;
</del><ins>+ $_post = sanitize_post($post, 'raw');
+ wp_cache_add($post->ID, $_post, 'posts');
</ins><span class="cx"> } else {
</span><span class="cx"> if ( is_object($post) )
</span><span class="cx"> $post = $post->ID;
</span><span class="lines">@@ -243,11 +243,13 @@
</span><span class="cx"> if ( ! $_post )
</span><span class="cx"> return $null;
</span><span class="cx"> _get_post_ancestors($_post);
</span><ins>+ $_post = sanitize_post($_post, 'raw');
</ins><span class="cx"> wp_cache_add($_post->ID, $_post, 'posts');
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $_post = sanitize_post($_post, $filter);
</del><ins>+ if ($filter != 'raw')
+ $_post = sanitize_post($_post, $filter);
</ins><span class="cx">
</span><span class="cx"> if ( $output == OBJECT ) {
</span><span class="cx"> return $_post;
</span><span class="lines">@@ -817,12 +819,18 @@
</span><span class="cx"> */
</span><span class="cx"> function sanitize_post($post, $context = 'display') {
</span><span class="cx"> if ( is_object($post) ) {
</span><ins>+ // Check if post already filtered for this context
+ if ( isset($post->filter) && $context == $post->filter )
+ return $post;
</ins><span class="cx"> if ( !isset($post->ID) )
</span><span class="cx"> $post->ID = 0;
</span><span class="cx"> foreach ( array_keys(get_object_vars($post)) as $field )
</span><span class="cx"> $post->$field = sanitize_post_field($field, $post->$field, $post->ID, $context);
</span><span class="cx"> $post->filter = $context;
</span><span class="cx"> } else {
</span><ins>+ // Check if post already filtered for this context
+ if ( isset($post['filter']) && $context == $post['filter'] )
+ return $post;
</ins><span class="cx"> if ( !isset($post['ID']) )
</span><span class="cx"> $post['ID'] = 0;
</span><span class="cx"> foreach ( array_keys($post) as $field )
</span><span class="lines">@@ -2450,6 +2458,12 @@
</span><span class="cx"> return $pages;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ // Sanitize before caching so it'll only get done once
+ $num_pages = count($pages);
+ for ($i = 0; $i < $num_pages; $i++) {
+ $pages[$i] = sanitize_post($pages[$i], 'raw');
+ }
+
</ins><span class="cx"> // Update cache.
</span><span class="cx"> update_page_cache($pages);
</span><span class="cx">
</span><span class="lines">@@ -2465,8 +2479,7 @@
</span><span class="cx"> foreach ( $children as $child )
</span><span class="cx"> $excludes[] = $child->ID;
</span><span class="cx"> $excludes[] = $exclude;
</span><del>- $total = count($pages);
- for ( $i = 0; $i < $total; $i++ ) {
</del><ins>+ for ( $i = 0; $i < $num_pages; $i++ ) {
</ins><span class="cx"> if ( in_array($pages[$i]->ID, $excludes) )
</span><span class="cx"> unset($pages[$i]);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpincludesqueryphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/query.php (12061 => 12062)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/query.php 2009-10-19 21:10:46 UTC (rev 12061)
+++ trunk/wp-includes/query.php 2009-10-19 21:28:44 UTC (rev 12062)
</span><span class="lines">@@ -2360,9 +2360,15 @@
</span><span class="cx"> if ( !$q['suppress_filters'] )
</span><span class="cx"> $this->posts = apply_filters('the_posts', $this->posts);
</span><span class="cx">
</span><ins>+ $this->post_count = count($this->posts);
+
+ // Sanitize before caching so it'll only get done once
+ for ($i = 0; $i < $this->post_count; $i++) {
+ $this->posts[$i] = sanitize_post($this->posts[$i], 'raw');
+ }
+
</ins><span class="cx"> update_post_caches($this->posts);
</span><span class="cx">
</span><del>- $this->post_count = count($this->posts);
</del><span class="cx"> if ($this->post_count > 0) {
</span><span class="cx"> $this->post = $this->posts[0];
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>