Ticket #16574: 16574.4.diff

wp-includes/nav-menu-template.php

@@ -287 +287 @@
                                 }
                         }
                 }
-        } elseif ( ! empty( $queried_object->post_type ) && is_post_type_hierarchical( $queried_object->post_type ) ) {
-                _get_post_ancestors( $queried_object );
         } elseif ( ! empty( $queried_object->taxonomy ) && is_taxonomy_hierarchical( $queried_object->taxonomy ) ) {
                 $term_hierarchy = _get_term_hierarchy( $queried_object->taxonomy );
                 $term_to_ancestor = array();
@@ -419 +417 @@
                                         'post_type' == $parent_item->type &&
                                         ! empty( $queried_object->post_type ) &&
                                         is_post_type_hierarchical( $queried_object->post_type ) &&
-                                        in_array( $parent_item->object_id, $queried_object->ancestors ) &&
+                                        in_array( $parent_item->object_id, get_post_ancestors( $queried_object ) ) &&
                                         $parent_item->object != $queried_object->ID
                                 ) ||
 

wp-includes/post-template.php

@@ -1035 +1035 @@
                 $css_class = array('page_item', 'page-item-'.$page->ID);
                 if ( !empty($current_page) ) {
                         $_current_page = get_page( $current_page );
-                        _get_post_ancestors($_current_page);
-                        if ( isset($_current_page->ancestors) && in_array($page->ID, (array) $_current_page->ancestors) )
+                        if ( in_array( $page->ID, get_post_ancestors( $current_page ) ) )
                                 $css_class[] = 'current_page_ancestor';
                         if ( $page->ID == $current_page )
                                 $css_class[] = 'current_page_item';

wp-includes/post.php

@@ -378 +378 @@
                 else
                         return $null;
         } elseif ( is_object($post) && empty($post->filter) ) {
-                _get_post_ancestors($post);
                 $_post = sanitize_post($post, 'raw');
                 wp_cache_add($post->ID, $_post, 'posts');
         } elseif ( is_object($post) && 'raw' == $post->filter ) {
@@ -394 +393 @@
                         $_post = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->posts WHERE ID = %d LIMIT 1", $post_id));
                         if ( ! $_post )
                                 return $null;
-                        _get_post_ancestors($_post);
                         $_post = sanitize_post($_post, 'raw');
                         wp_cache_add($_post->ID, $_post, 'posts');
                 }
@@ -424 +422 @@
  * @param int|object $post Post ID or post object
  * @return array Ancestor IDs or empty array if none are found.
  */
-function get_post_ancestors($post) {
-        $post = get_post($post);
+function get_post_ancestors( $post ) {
+        $post = get_post( $post );
+
+        if ( !$post )
+                return false;
+
+        if ( ! $ancestors = wp_cache_get( $post->ID, 'post_ancestors' ) ) {
+                $ancestors = array();
+
+                if ( !empty( $post->post_parent ) && $post->ID != $post->post_parent ) {
+                        $id = $ancestors[] = $post->post_parent;
+
+                        while ( $ancestor = get_post( $id ) ) {
+                                // Loop detection: If the ancestor has been seen before, break.
+                                if ( empty( $ancestor->post_parent ) || ( $ancestor->post_parent == $post->ID ) || in_array( $ancestor->post_parent, $ancestors ) )
+                                        break;
 
-        if ( !empty($post->ancestors) )
-                return $post->ancestors;
+                                $id = $ancestors[] = $ancestor->post_parent;
+                        }
+                }
+
+                wp_cache_add( $post->ID, $ancestors, 'post_ancestors' );
+        }
 
-        return array();
+        return $ancestors;
 }
 
 /**
@@ -4613 +4629 @@
 }
 
 /**
- * Retrieve post ancestors and append to post ancestors property.
- *
- * Will only retrieve ancestors once, if property is already set, then nothing
- * will be done. If there is not a parent post, or post ID and post parent ID
- * are the same then nothing will be done.
- *
- * The parameter is passed by reference, so nothing needs to be returned. The
- * property will be updated and can be referenced after the function is
- * complete. The post parent will be an ancestor and the parent of the post
- * parent will be an ancestor. There will only be two ancestors at the most.
- *
- * @since 2.5.0
- * @access private
- * @uses $wpdb
- *
- * @param object $_post Post data.
- * @return null When nothing needs to be done.
- */
-function _get_post_ancestors(&$_post) {
-        global $wpdb;
-
-        if ( isset($_post->ancestors) )
-                return;
-
-        $_post->ancestors = array();
-
-        if ( empty($_post->post_parent) || $_post->ID == $_post->post_parent )
-                return;
-
-        $id = $_post->ancestors[] = $_post->post_parent;
-        while ( $ancestor = $wpdb->get_var( $wpdb->prepare("SELECT `post_parent` FROM $wpdb->posts WHERE ID = %d LIMIT 1", $id) ) ) {
-                // Loop detection: If the ancestor has been seen before, break.
-                if ( ( $ancestor == $_post->ID ) || in_array($ancestor,  $_post->ancestors) )
-                        break;
-                $id = $_post->ancestors[] = $ancestor;
-        }
-}
-
-/**
  * Determines which fields of posts are to be saved in revisions.
  *
  * Does two things. If passed a post *array*, it will return a post array ready
@@ -5338 +5315 @@
 
                 update_post_caches( $fresh_posts, 'any', $update_term_cache, $update_meta_cache );
         }
-}
- No newline at end of file
+}

wp-includes/taxonomy.php

@@ -3206 +3206 @@
                         $ancestors[] = (int) $term->parent;
                         $term = get_term($term->parent, $object_type);
                 }
-        } elseif ( null !== get_post_type_object( $object_type ) ) {
-                $object = get_post($object_id);
-                if ( ! is_wp_error( $object ) && isset( $object->ancestors ) && is_array( $object->ancestors ) )
-                        $ancestors = $object->ancestors;
-                else {
-                        while ( ! is_wp_error($object) && ! empty( $object->post_parent ) && ! in_array( $object->post_parent, $ancestors ) ) {
-                                $ancestors[] = (int) $object->post_parent;
-                                $object = get_post($object->post_parent);
-                        }
-                }
+        } elseif ( post_type_exists( $object_type ) ) {
+                $ancestors = get_post_ancestors($object_id);
         }
 
         return apply_filters('get_ancestors', $ancestors, $object_id, $object_type);