Changeset 29318

Timestamp:

07/29/2014 12:50:53 AM (11 years ago)

Author:

SergeyBiryukov

Message:

Avoid PHP notices in _count_posts_cache_key(), _update_blog_date_on_post_publish(), and _update_blog_date_on_post_delete() if post type is not registered.

props jesin.
fixes #28135.

Location:

trunk/src/wp-includes

Files:

• ms-blogs.php (modified) (2 diffs)
• post.php (modified) (1 diff)

trunk/src/wp-includes/ms-blogs.php

@@ -875 +875 @@
 function _update_blog_date_on_post_publish( $new_status, $old_status, $post ) {
     $post_type_obj = get_post_type_object( $post->post_type );
-    if ( ! $post_type_obj->public )
+    if ( ! $post_type_obj || ! $post_type_obj->public ) {
         return;
-
-    if ( 'publish' != $new_status && 'publish' != $old_status )
+    }
+
+    if ( 'publish' != $new_status && 'publish' != $old_status ) {
         return;
+    }
 
     // Post was freshly published, published post was saved, or published post was unpublished.
@@ -897 +899 @@
 
     $post_type_obj = get_post_type_object( $post->post_type );
-    if ( ! $post_type_obj->public )
+    if ( ! $post_type_obj || ! $post_type_obj->public ) {
         return;
-
-    if ( 'publish' != $post->post_status )
+    }
+
+    if ( 'publish' != $post->post_status ) {
         return;
+    }
 
     wpmu_update_blogs_date();

trunk/src/wp-includes/post.php

@@ -2315 +2315 @@
     if ( 'readable' == $perm && is_user_logged_in() ) {
         $post_type_object = get_post_type_object( $type );
-        if ( ! current_user_can( $post_type_object->cap->read_private_posts ) ) {
+        if ( $post_type_object && ! current_user_can( $post_type_object->cap->read_private_posts ) ) {
             $cache_key .= '_' . $perm . '_' . get_current_user_id();
         }