mirror of
https://github.com/WordPress/WordPress.git
synced 2024-12-23 09:37:42 +01:00
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:
parent
103f6e7860
commit
ae4cf7665a
@ -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).
|
||||
*
|
||||
* @since 3.0.0
|
||||
* @access private
|
||||
*
|
||||
* @param object $post_type_object
|
||||
* @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
|
||||
*/
|
||||
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;
|
||||
|
@ -438,6 +438,8 @@ function register_taxonomy( $taxonomy, $object_type, $args = array() ) {
|
||||
*/
|
||||
|
||||
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;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user