Changeset 14619

Timestamp:

05/14/2010 02:13:49 AM (14 years ago)

Author:

nbachiyski

Message:

Keep label as a quick way to set up a taxonomy/post type, without diving into the labels array. Deprecate singular_label while there. Props nacin. Fixes #13357

Location:

trunk/wp-includes

Files:

• post.php (modified) (4 diffs)
• taxonomy.php (modified) (3 diffs)

trunk/wp-includes/post.php

@@ -772 +772 @@
  * Optional $args contents:
  *
+ * - label - Name of the post type shown in the menu. Usually plural. If not set, labels['name'] will be used.
  * - description - A short descriptive summary of what the post type is. Defaults to blank.
  * - public - Whether posts of this type should be shown in the admin UI. Defaults to false.
@@ -870 +871 @@
 
     $args->labels = get_post_type_labels( $args );
-    
-    // we keep these two only for backwards compatibility
-    // TODO: remove in 3.1  
     $args->label = $args->labels->name;
-    $args->singular_label = $args->labels->singular_name;
 
     $wp_post_types[$post_type] = $args;
@@ -921 +918 @@
  * 
  * Accepted keys of the label array in the post type object:
- * - name - general name for the post type, usually plural. Default is Posts/Pages
+ * - name - general name for the post type, usually plural. The same and overriden by $post_type_object->label. Default is Posts/Pages
  * - singular_name - name for one object of this post type. Default is Post/Page
  * - add_new - Default is Add New for both hierarchical and non-hierarchical types. When internationalizing this string, please use a {@link http://codex.wordpress.org/I18n_for_WordPress_Developers#Disambiguation_by_context gettext context} matching your post type. Example: <code>_x('Add New', 'product');</code>
@@ -966 +963 @@
 function _get_custom_object_labels( $object, $nohier_vs_hier_defaults ) {
     
-    // try to get missing (singular_)?name from older style (singular_)?label member variables
-    // we keep that for backwards compatibility
-    // TODO: remove in 3.1
-    if ( !isset( $object->labels['name'] ) && isset( $object->label ) ) {
+    if ( isset( $object->label ) ) {
         $object->labels['name'] = $object->label;
-    }
-    if ( !isset( $object->labels['singular_name'] ) && isset( $object->singular_label ) ) {
-        $object->labels['singular_name'] = $object->singular_label;
     }
     

trunk/wp-includes/taxonomy.php

@@ -211 +211 @@
  *
  * Optional $args contents:
+ * 
+ * label - Name of the taxonomy shown in the menu. Usually plural. If not set, labels['name'] will be used.
  *
  * hierarchical - has some defined purpose at other parts of the API and is a
@@ -298 +300 @@
     $args['name'] = $taxonomy;
     $args['object_type'] = (array) $object_type;
+
     $args['labels'] = get_taxonomy_labels( (object) $args );
-    
-    // we keep these two only for backwards compatibility
-    // TODO: remove in 3.1  
     $args['label'] = $args['labels']->name;
-    $args['singular_label'] = $args['labels']->singular_name;
     
     $wp_taxonomies[$taxonomy] = (object) $args;
@@ -315 +314 @@
  * 
  * Accepted keys of the label array in the taxonomy object:
- * - name - general name for the taxonomy, usually plural. Default is Post Tags/Categories
+ * - name - general name for the taxonomy, usually plural. The same as and overriden by $tax->label. Default is Post Tags/Categories
  * - singular_name - name for one object of this taxonomy. Default is Post Tag/Category
  * - search_items - Default is Search Tags/Search Categories