Ticket #16310: tax-labels.patch

wp-includes/post.php

@@ -1170 +1170 @@
  * @since 3.0.0
  */
 function _get_custom_object_labels( $object, $nohier_vs_hier_defaults ) {
+        
+        $object->labels = (array) $object->labels; 
 
         if ( isset( $object->label ) && empty( $object->labels['name'] ) )
                 $object->labels['name'] = $object->label;

wp-includes/taxonomy.php

@@ -390 +390 @@
  */
 
 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;