Ticket #26746: 26746.3.patch

src/wp-includes/post.php

@@ -1506 +1506 @@
  * @return object object with all the labels as member variables
  */
 function get_post_type_labels( $post_type_object ) {
-        $nohier_vs_hier_defaults = array(
-                'name' => array( _x('Posts', 'post type general name'), _x('Pages', 'post type general name') ),
-                'singular_name' => array( _x('Post', 'post type singular name'), _x('Page', 'post type singular name') ),
-                'add_new' => array( _x('Add New', 'post'), _x('Add New', 'page') ),
-                'add_new_item' => array( __('Add New Post'), __('Add New Page') ),
-                'edit_item' => array( __('Edit Post'), __('Edit Page') ),
-                'new_item' => array( __('New Post'), __('New Page') ),
-                'view_item' => array( __('View Post'), __('View Page') ),
-                'search_items' => array( __('Search Posts'), __('Search Pages') ),
-                'not_found' => array( __('No posts found.'), __('No pages found.') ),
-                'not_found_in_trash' => array( __('No posts found in Trash.'), __('No pages found in Trash.') ),
-                'parent_item_colon' => array( null, __('Parent Page:') ),
-                'all_items' => array( __( 'All Posts' ), __( 'All Pages' ) )
-        );
-        $nohier_vs_hier_defaults['menu_name'] = $nohier_vs_hier_defaults['name'];
+        static $nohier_vs_hier_defaults;
 
+        if ( empty( $nohier_vs_hier_defaults ) || ! did_action( 'init' ) ) {
+                $nohier_vs_hier_defaults = array(
+                        'name'               => array( _x( 'Posts', 'post type general name' ), _x( 'Pages', 'post type general name' ) ),
+                        'singular_name'      => array( _x( 'Post', 'post type singular name' ), _x( 'Page', 'post type singular name' ) ),
+                        'add_new'            => array( _x( 'Add New', 'post' ),                 _x( 'Add New', 'page' ) ),
+                        'add_new_item'       => array( __( 'Add New Post' ),                    __( 'Add New Page' ) ),
+                        'edit_item'          => array( __( 'Edit Post' ),                       __( 'Edit Page' ) ),
+                        'new_item'           => array( __( 'New Post' ),                        __( 'New Page' ) ),
+                        'view_item'          => array( __( 'View Post' ),                       __( 'View Page' ) ),
+                        'search_items'       => array( __( 'Search Posts' ),                    __( 'Search Pages' ) ),
+                        'not_found'          => array( __( 'No posts found.' ),                 __( 'No pages found.' ) ),
+                        'not_found_in_trash' => array( __( 'No posts found in Trash.' ),        __( 'No pages found in Trash.' ) ),
+                        'parent_item_colon'  => array( null,                                    __( 'Parent Page:' ) ),
+                        'all_items'          => array( __( 'All Posts' ),                       __( 'All Pages' ) )
+                );
+
+                $nohier_vs_hier_defaults['menu_name'] = $nohier_vs_hier_defaults['name'];
+        }
+
         $labels = _get_custom_object_labels( $post_type_object, $nohier_vs_hier_defaults );
 
         $post_type = $post_type_object->name;

src/wp-includes/taxonomy.php

@@ -461 +461 @@
  */
 
 function get_taxonomy_labels( $tax ) {
+        static $nohier_vs_hier_defaults;
+
         $tax->labels = (array) $tax->labels;
 
-        if ( isset( $tax->helps ) && empty( $tax->labels['separate_items_with_commas'] ) )
+        if ( isset( $tax->helps ) && empty( $tax->labels['separate_items_with_commas'] ) ) {
                 $tax->labels['separate_items_with_commas'] = $tax->helps;
+        }
 
-        if ( isset( $tax->no_tagcloud ) && empty( $tax->labels['not_found'] ) )
+        if ( isset( $tax->no_tagcloud ) && empty( $tax->labels['not_found'] ) ) {
                 $tax->labels['not_found'] = $tax->no_tagcloud;
+        }
 
-        $nohier_vs_hier_defaults = array(
-                'name' => array( _x( 'Tags', 'taxonomy general name' ), _x( 'Categories', 'taxonomy general name' ) ),
-                'singular_name' => array( _x( 'Tag', 'taxonomy singular name' ), _x( 'Category', 'taxonomy singular name' ) ),
-                'search_items' => array( __( 'Search Tags' ), __( 'Search Categories' ) ),
-                'popular_items' => array( __( 'Popular Tags' ), null ),
-                'all_items' => array( __( 'All Tags' ), __( 'All Categories' ) ),
-                'parent_item' => array( null, __( 'Parent Category' ) ),
-                'parent_item_colon' => array( null, __( 'Parent Category:' ) ),
-                'edit_item' => array( __( 'Edit Tag' ), __( 'Edit Category' ) ),
-                'view_item' => array( __( 'View Tag' ), __( 'View Category' ) ),
-                'update_item' => array( __( 'Update Tag' ), __( 'Update Category' ) ),
-                'add_new_item' => array( __( 'Add New Tag' ), __( 'Add New Category' ) ),
-                'new_item_name' => array( __( 'New Tag Name' ), __( 'New Category Name' ) ),
-                'separate_items_with_commas' => array( __( 'Separate tags with commas' ), null ),
-                'add_or_remove_items' => array( __( 'Add or remove tags' ), null ),
-                'choose_from_most_used' => array( __( 'Choose from the most used tags' ), null ),
-                'not_found' => array( __( 'No tags found.' ), null ),
-        );
-        $nohier_vs_hier_defaults['menu_name'] = $nohier_vs_hier_defaults['name'];
+        if ( empty( $nohier_vs_hier_defaults ) || ! did_action( 'init' ) ) {
+                $nohier_vs_hier_defaults = array(
+                        'name'                       => array( _x( 'Tags', 'taxonomy general name' ),  _x( 'Categories', 'taxonomy general name' ) ),
+                        'singular_name'              => array( _x( 'Tag', 'taxonomy singular name' ),  _x( 'Category', 'taxonomy singular name' ) ),
+                        'search_items'               => array( __( 'Search Tags' ),                    __( 'Search Categories' ) ),
+                        'popular_items'              => array( __( 'Popular Tags' ),                   null ),
+                        'all_items'                  => array( __( 'All Tags' ),                       __( 'All Categories' ) ),
+                        'parent_item'                => array( null,                                   __( 'Parent Category' ) ),
+                        'parent_item_colon'          => array( null,                                   __( 'Parent Category:' ) ),
+                        'edit_item'                  => array( __( 'Edit Tag' ),                       __( 'Edit Category' ) ),
+                        'view_item'                  => array( __( 'View Tag' ),                       __( 'View Category' ) ),
+                        'update_item'                => array( __( 'Update Tag' ),                     __( 'Update Category' ) ),
+                        'add_new_item'               => array( __( 'Add New Tag' ),                    __( 'Add New Category' ) ),
+                        'new_item_name'              => array( __( 'New Tag Name' ),                   __( 'New Category Name' ) ),
+                        'separate_items_with_commas' => array( __( 'Separate tags with commas' ),      null ),
+                        'add_or_remove_items'        => array( __( 'Add or remove tags' ),             null ),
+                        'choose_from_most_used'      => array( __( 'Choose from the most used tags' ), null ),
+                        'not_found'                  => array( __( 'No tags found.' ),                 null ),
+                );
 
+                $nohier_vs_hier_defaults['menu_name'] = $nohier_vs_hier_defaults['name'];
+        }
+
         return _get_custom_object_labels( $tax, $nohier_vs_hier_defaults );
 }