Changeset 25553

Timestamp:

09/21/2013 05:43:14 PM (11 years ago)

Author:

wonderboymusic

Message:

Add @access private to _get_custom_object_labels(), which was already implied by the dangling underscore. Cast $labels to array in get_taxonomy_labels() and _get_custom_object_labels().

Props nacin, foofy.
Fixes #16310.

Location:

trunk/src/wp-includes

Files:

• post.php (modified) (2 diffs)
• taxonomy.php (modified) (1 diff)

trunk/src/wp-includes/post.php

@@ -1474 +1474 @@
  *
  * @since 3.0.0
+ * @access private
+ *
  * @param object $post_type_object
  * @return object object with all the labels as member variables
@@ -1507 +1509 @@
  */
 function _get_custom_object_labels( $object, $nohier_vs_hier_defaults ) {
+    $object->labels = (array) $object->labels;
 
     if ( isset( $object->label ) && empty( $object->labels['name'] ) )

trunk/src/wp-includes/taxonomy.php

@@ -439 +439 @@
 
 function get_taxonomy_labels( $tax ) {
+    $tax->labels = (array) $tax->labels;
+
     if ( isset( $tax->helps ) && empty( $tax->labels['separate_items_with_commas'] ) )
         $tax->labels['separate_items_with_commas'] = $tax->helps;