WordPress.org

Make WordPress Core

Changeset 23483


Ignore:
Timestamp:
02/25/13 18:35:05 (2 years ago)
Author:
SergeyBiryukov
Message:

Move 'no_tagcloud' argument to the taxonomy labels object. props DrewAPicture for initial patch. fixes #23597.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-admin/includes/ajax-actions.php

    r23481 r23483  
    656656 
    657657    if ( empty( $tags ) ) 
    658         wp_die( isset( $tax->no_tagcloud ) ? $tax->no_tagcloud : __('No tags found!') ); 
     658        wp_die( $tax->labels->no_tagcloud ); 
    659659 
    660660    if ( is_wp_error( $tags ) ) 
  • trunk/wp-includes/taxonomy.php

    r23416 r23483  
    412412 * - add_or_remove_items - This string isn't used on hierarchical taxonomies. Default is "Add or remove tags", used in the meta box when JavaScript is disabled. 
    413413 * - choose_from_most_used - This string isn't used on hierarchical taxonomies. Default is "Choose from the most used tags", used in the meta box. 
     414 * - no_tagcloud - This string isn't used on hierarchical taxonomies. Default is "No tags found!", used in the meta box. 
    414415 * 
    415416 * Above, the first default value is for non-hierarchical taxonomies (like tags) and the second one is for hierarchical taxonomies (like categories). 
     
    423424    if ( isset( $tax->helps ) && empty( $tax->labels['separate_items_with_commas'] ) ) 
    424425        $tax->labels['separate_items_with_commas'] = $tax->helps; 
     426 
     427    if ( isset( $tax->no_tagcloud ) && empty( $tax->labels['no_tagcloud'] ) ) 
     428        $tax->labels['no_tagcloud'] = $tax->no_tagcloud; 
    425429 
    426430    $nohier_vs_hier_defaults = array( 
     
    440444        'add_or_remove_items' => array( __( 'Add or remove tags' ), null ), 
    441445        'choose_from_most_used' => array( __( 'Choose from the most used tags' ), null ), 
     446        'no_tagcloud' => array( __( 'No tags found!' ), null ), 
    442447    ); 
    443448    $nohier_vs_hier_defaults['menu_name'] = $nohier_vs_hier_defaults['name']; 
Note: See TracChangeset for help on using the changeset viewer.