Changeset 12062 for trunk/wp-includes/post.php

Timestamp:

10/19/2009 09:28:44 PM (15 years ago)

Author:

ryan

Message:

Improve sanitize_post() performance. Perform raw filtering only once. Add filter check to eliminate double filtering. Props johanee. fixes #10972 see #10801

File:

• trunk/wp-includes/post.php (modified) (6 diffs)

trunk/wp-includes/post.php

@@ -233 +233 @@
     } elseif ( is_object($post) && empty($post->filter) ) {
         _get_post_ancestors($post);
-        wp_cache_add($post->ID, $post, 'posts');
-        $_post = &$post;
+        $_post = sanitize_post($post, 'raw');
+        wp_cache_add($post->ID, $_post, 'posts');
     } else {
         if ( is_object($post) )
@@ -244 +244 @@
                 return $null;
             _get_post_ancestors($_post);
+            $_post = sanitize_post($_post, 'raw');
             wp_cache_add($_post->ID, $_post, 'posts');
         }
     }
 
-    $_post = sanitize_post($_post, $filter);
+    if ($filter != 'raw')
+        $_post = sanitize_post($_post, $filter);
 
     if ( $output == OBJECT ) {
@@ -818 +820 @@
 function sanitize_post($post, $context = 'display') {
     if ( is_object($post) ) {
+        // Check if post already filtered for this context
+        if ( isset($post->filter) && $context == $post->filter )
+            return $post;
         if ( !isset($post->ID) )
             $post->ID = 0;
@@ -824 +829 @@
         $post->filter = $context;
     } else {
+        // Check if post already filtered for this context
+        if ( isset($post['filter']) && $context == $post['filter'] )
+            return $post;
         if ( !isset($post['ID']) )
             $post['ID'] = 0;
@@ -2451 +2459 @@
     }
 
+    // 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');
+    }
+
     // Update cache.
     update_page_cache($pages);
@@ -2466 +2480 @@
             $excludes[] = $child->ID;
         $excludes[] = $exclude;
-        $total = count($pages);
-        for ( $i = 0; $i < $total; $i++ ) {
+        for ( $i = 0; $i < $num_pages; $i++ ) {
             if ( in_array($pages[$i]->ID, $excludes) )
                 unset($pages[$i]);