Ticket #10972: posts-only-sanitize-once-2.patch

wp-includes/post.php

@@ -232 +232 @@
                         return $null;
         } 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) )
                         $post = $post->ID;
@@ -243 +243 @@
                         if ( ! $_post )
                                 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 ) {
                 return $_post;
@@ -817 +819 @@
  */
 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;
                 foreach ( array_keys(get_object_vars($post)) as $field )
                         $post->$field = sanitize_post_field($field, $post->$field, $post->ID, $context);
                 $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;
                 foreach ( array_keys($post) as $field )
@@ -2450 +2458 @@
                 return $pages;
         }
 
+        // 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);
 

wp-includes/query.php

@@ -2360 +2360 @@
                 if ( !$q['suppress_filters'] )
                         $this->posts = apply_filters('the_posts', $this->posts);
 
+                // Sanitize before caching so it'll only get done once
+                $num_posts = count($this->posts);
+                for ($i = 0; $i < $num_posts; $i++) {
+                        $this->posts[$i] = sanitize_post($this->posts[$i], 'raw');
+                }
+
                 update_post_caches($this->posts);
 
                 $this->post_count = count($this->posts);