Ticket #23031: 23031.diff

wp-admin/includes/plugin.php

@@ -1413 +1413 @@
                 foreach ( $submenu[$parent] as $submenu_array ) {
                         if ( isset( $_wp_real_parent_file[$parent] ) )
                                 $parent = $_wp_real_parent_file[$parent];
-                        if ( !empty($typenow) && ($submenu_array[2] == "$pagenow?post_type=$typenow") ) {
+                        if ( !empty($typenow) && ( isset( $submenu_array[2] ) && $submenu_array[2] == "$pagenow?post_type=$typenow") ) {
                                 $parent_file = $parent;
                                 return $parent;
-                        } elseif ( $submenu_array[2] == $pagenow && empty($typenow) && ( empty($parent_file) || false === strpos($parent_file, '?') ) ) {
+                        } elseif ( isset( $submenu_array[2] ) && $submenu_array[2] == $pagenow && empty($typenow) && ( empty($parent_file) || false === strpos($parent_file, '?') ) ) {
                                 $parent_file = $parent;
                                 return $parent;
                         } else

wp-admin/index.php

@@ -76 +76 @@
         $help .= '<p>' . __('<strong>Recent Comments</strong> - Shows the most recent comments on your posts (configurable, up to 30) and allows you to moderate them.') . '</p>';
 if ( current_user_can( 'publish_posts' ) )
         $help .= '<p>' . __('<strong>Incoming Links</strong> - Shows links to your site found by Google Blog Search.') . '</p>';
-if ( current_user_can( get_post_type_object( 'post' )->cap->create_posts ) ) {
-        $help .= '<p>' . __('<strong>QuickPress</strong> - Allows you to create a new post and either publish it or save it as a draft.') . '</p>';
-        $help .= '<p>' . __('<strong>Recent Drafts</strong> - Displays links to the 5 most recent draft posts you&#8217;ve started.') . '</p>';
+if( post_type_exists( 'post ' ) ) {
+        if ( current_user_can( get_post_type_object( 'post' )->cap->create_posts ) ) {
+                $help .= '<p>' . __('<strong>QuickPress</strong> - Allows you to create a new post and either publish it or save it as a draft.') . '</p>';
+                $help .= '<p>' . __('<strong>Recent Drafts</strong> - Displays links to the 5 most recent draft posts you&#8217;ve started.') . '</p>';
+        }
 }
 $help .= '<p>' . __('<strong>WordPress Blog</strong> - Latest news from the official WordPress project.') . '</p>';
 $help .= '<p>' . __('<strong>Other WordPress News</strong> - Shows the <a href="http://planet.wordpress.org" target="_blank">WordPress Planet</a> feed. You can configure it to show a different feed of your choosing.') . '</p>';

wp-admin/menu.php

@@ -49 +49 @@
 $menu[5] = array( __('Posts'), 'edit_posts', 'edit.php', '', 'open-if-no-js menu-top menu-icon-post', 'menu-posts', 'none' );
         $submenu['edit.php'][5]  = array( __('All Posts'), 'edit_posts', 'edit.php' );
         /* translators: add new post */
-        $submenu['edit.php'][10]  = array( _x('Add New', 'post'), get_post_type_object( 'post' )->cap->create_posts, 'post-new.php' );
+        
+        if( post_type_exists( 'post' ) ) {
+                $submenu['edit.php'][10]  = array( _x('Add New', 'post'), get_post_type_object( 'post' )->cap->create_posts, 'post-new.php' );
+        }
 
         $i = 15;
         foreach ( get_taxonomies( array(), 'objects' ) as $tax ) {

wp-includes/admin-bar.php

@@ -362 +362 @@
                         'title'  => __( 'Dashboard' ),
                         'href'   => admin_url(),
                 ) );
-
-                if ( current_user_can( get_post_type_object( 'post' )->cap->create_posts ) ) {
-                        $wp_admin_bar->add_menu( array(
-                                'parent' => $menu_id,
-                                'id'     => $menu_id . '-n',
-                                'title'  => __( 'New Post' ),
-                                'href'   => admin_url( 'post-new.php' ),
-                        ) );
+                
+                if( post_type_exists( 'post' ) ) {
+                        if ( current_user_can( get_post_type_object( 'post' )->cap->create_posts ) ) {
+                                $wp_admin_bar->add_menu( array(
+                                        'parent' => $menu_id,
+                                        'id'     => $menu_id . '-n',
+                                        'title'  => __( 'New Post' ),
+                                        'href'   => admin_url( 'post-new.php' ),
+                                ) );
+                        }
                 }
 
                 if ( current_user_can( 'edit_posts' ) ) {