Changeset 15190 for trunk/wp-includes/post.php

Timestamp:

06/10/2010 04:07:33 PM (15 years ago)

Author:

nacin

Message:

Move 'helps' argument to the taxonomy labels object. Also move over help_nojs and help_cloud, both introduced in 3.0. This adds three new core labels for non-hierarchical taxonomies, for tweaking the meta box strings. fixes #13805.

File:

• trunk/wp-includes/post.php (modified) (1 diff)

trunk/wp-includes/post.php

@@ -967 +967 @@
 function _get_custom_object_labels( $object, $nohier_vs_hier_defaults ) {
 
-    if ( isset( $object->label ) ) {
+    if ( isset( $object->label ) && empty( $object->labels['name'] ) )
         $object->labels['name'] = $object->label;
-    }
-
-    if ( !isset( $object->labels['singular_name'] ) && isset( $object->labels['name'] ) ) {
+
+    if ( !isset( $object->labels['singular_name'] ) && isset( $object->labels['name'] ) )
         $object->labels['singular_name'] = $object->labels['name'];
-    }
 
     $defaults = array_map( create_function( '$x', $object->hierarchical? 'return $x[1];' : 'return $x[0];' ), $nohier_vs_hier_defaults );