WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.


Built from https://develop.svn.wordpress.org/trunk@25553


git-svn-id: http://core.svn.wordpress.org/trunk@25473 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Scott Taylor 2013-09-21 17:44:09 +00:00
parent 103f6e7860
commit ae4cf7665a
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
wp-includes/post.php
View File

@ -1473,6 +1473,8 @@ function _post_type_meta_capabilities( $capabilities = null ) {
* Above, the first default value is for non-hierarchical post types (like posts) and the second one is for hierarchical post types (like pages). * Above, the first default value is for non-hierarchical post types (like posts) and the second one is for hierarchical post types (like pages).
* *
* @since 3.0.0 * @since 3.0.0
* @access private
*
* @param object $post_type_object * @param object $post_type_object
* @return object object with all the labels as member variables * @return object object with all the labels as member variables
*/ */
@ -1506,6 +1508,7 @@ function get_post_type_labels( $post_type_object ) {
* @since 3.0.0 * @since 3.0.0
*/ */
function _get_custom_object_labels( $object, $nohier_vs_hier_defaults ) { function _get_custom_object_labels( $object, $nohier_vs_hier_defaults ) {
$object->labels = (array) $object->labels;
if ( isset( $object->label ) && empty( $object->labels['name'] ) ) if ( isset( $object->label ) && empty( $object->labels['name'] ) )
$object->labels['name'] = $object->label; $object->labels['name'] = $object->label;

2
wp-includes/taxonomy.php
View File

@ -438,6 +438,8 @@ function register_taxonomy( $taxonomy, $object_type, $args = array() ) {
*/ */
function get_taxonomy_labels( $tax ) { function get_taxonomy_labels( $tax ) {
$tax->labels = (array) $tax->labels;
if ( isset( $tax->helps ) && empty( $tax->labels['separate_items_with_commas'] ) ) if ( isset( $tax->helps ) && empty( $tax->labels['separate_items_with_commas'] ) )
$tax->labels['separate_items_with_commas'] = $tax->helps; $tax->labels['separate_items_with_commas'] = $tax->helps;