WordPress.org

Make WordPress Core

Ticket #11644: 11644.changes.r12712.diff

File 11644.changes.r12712.diff, 2.5 KB (added by nacin, 8 years ago)

Revert/change some things that got in on r12712

  • wp-admin/admin.php

     
    6060
    6161set_screen_options();
    6262
    63 $posts_per_page = get_option('posts_per_page');
    6463$date_format = get_option('date_format');
    6564$time_format = get_option('time_format');
    6665
  • wp-admin/categories.php

     
    297297        <input name="cat_name" id="cat_name" type="text" value="" size="40" aria-required="true" />
    298298    <p><?php _e('The name is used to identify the category almost everywhere, for example under the post or in the category widget.'); ?></p>
    299299</div>
    300 <?php if ( is_multisite() ) { ?>
     300<?php if ( ! is_multisite() ) { ?>
    301301<div class="form-field">
    302302        <label for="category_nicename"><?php _e('Category Slug') ?></label>
    303303        <input name="category_nicename" id="category_nicename" type="text" value="" size="40" />
  • wp-admin/edit-category-form.php

     
    5858                        <th scope="row" valign="top"><label for="cat_name"><?php _e('Category Name') ?></label></th>
    5959                        <td><input name="cat_name" id="cat_name" type="text" value="<?php echo esc_attr($category->name); ?>" size="40" aria-required="true" /></td>
    6060                </tr>
    61 <?php if ( is_multisite() ) { ?>
     61<?php if ( ! is_multisite() ) { ?>
    6262                <tr class="form-field">
    6363                        <th scope="row" valign="top"><label for="category_nicename"><?php _e('Category Slug') ?></label></th>
    6464                        <td><input name="category_nicename" id="category_nicename" type="text" value="<?php echo esc_attr(apply_filters('editable_slug', $category->slug)); ?>" size="40" /><br />
  • wp-admin/edit-link-categories.php

     
    200200        <label for="name"><?php _e('Link Category name') ?></label>
    201201        <input name="name" id="name" type="text" value="" size="40" aria-required="true" />
    202202</div>
    203 <?php if ( is_multisite() ) { ?>
     203<?php if ( ! is_multisite() ) { ?>
    204204<div class="form-field">
    205205        <label for="slug"><?php _e('Link Category slug') ?></label>
    206206        <input name="slug" id="slug" type="text" value="" size="40" />