Changeset 14619 for trunk/wp-includes/taxonomy.php

Timestamp:

05/14/2010 02:13:49 AM (16 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

File:

• trunk/wp-includes/taxonomy.php (modified) (3 diffs)

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