Make WordPress Core

Changeset 15263


Ignore:
Timestamp:
06/15/2010 08:07:02 PM (14 years ago)
Author:
markjaquith
Message:

Make the number of taxonomies to display per page setting actually stick. props nacin. fixes #13899

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-admin/edit-tags.php

    r15220 r15263  
    250250    $pagenum = 1;
    251251
    252 if ( 'post_tag' == $taxonomy )
    253     $tags_per_page = (int) get_user_option( 'edit_tags_per_page' );
    254 elseif ( 'category' == $taxonomy )
    255     $tags_per_page = (int) get_user_option( 'categories_per_page' );
    256 else
    257     $tags_per_page = (int) get_user_option( 'edit_' .  $taxonomy . '_per_page' );
     252$tags_per_page = (int) get_user_option( 'edit_' .  $taxonomy . '_per_page' );
    258253
    259254if ( empty($tags_per_page) || $tags_per_page < 1 )
  • trunk/wp-admin/includes/misc.php

    r14718 r15263  
    338338        if ( in_array($type, get_post_types()) )
    339339            $map_option = 'edit_per_page';
     340        if ( in_array( $type, get_taxonomies()) )
     341            $map_option = 'edit_tags_per_page';
     342
    340343
    341344        switch ( $map_option ) {
     
    345348            case 'edit_comments_per_page':
    346349            case 'upload_per_page':
    347             case 'categories_per_page':
    348350            case 'edit_tags_per_page':
    349351            case 'plugins_per_page':
  • trunk/wp-admin/includes/upgrade.php

    r15211 r15263  
    441441        upgrade_290();
    442442
    443     if ( $wp_current_db_version < 15187 )
     443    if ( $wp_current_db_version < 15260 )
    444444        upgrade_300();
    445445
     
    11341134        $prefix = like_escape($wpdb->base_prefix);
    11351135        $wpdb->query( "DELETE FROM $wpdb->usermeta WHERE meta_key LIKE '{$prefix}%meta-box-hidden%' OR meta_key LIKE '{$prefix}%closedpostboxes%' OR meta_key LIKE '{$prefix}%manage-%-columns-hidden%' OR meta_key LIKE '{$prefix}%meta-box-order%' OR meta_key LIKE '{$prefix}%metaboxorder%' OR meta_key LIKE '{$prefix}%screen_layout%'
    1136                      OR meta_key = 'manageedittagscolumnshidden' OR meta_key='managecategoriescolumnshidden' OR meta_key = 'manageedit-tagscolumnshidden' OR meta_key = 'manageeditcolumnshidden'" );
     1136                     OR meta_key = 'manageedittagscolumnshidden' OR meta_key='managecategoriescolumnshidden' OR meta_key = 'manageedit-tagscolumnshidden' OR meta_key = 'manageeditcolumnshidden' OR meta_key = 'categories_per_page' OR meta_key = 'edit_tags_per_page'" );
    11371137    }
    11381138
  • trunk/wp-includes/version.php

    r15258 r15263  
    99 * @global string $wp_version
    1010 */
    11 $wp_version = '3.0-RC3-15257';
     11$wp_version = '3.0-RC3-15260';
    1212
    1313/**
     
    1616 * @global int $wp_db_version
    1717 */
    18 $wp_db_version = 15187;
     18$wp_db_version = 15260;
    1919
    2020/**
Note: See TracChangeset for help on using the changeset viewer.