WordPress.org

Make WordPress Core

Changeset 18889


Ignore:
Timestamp:
10/05/11 18:46:21 (3 years ago)
Author:
azaozz
Message:

Revert 'auto' column setting, props markjaquith, see #18863

Location:
trunk/wp-admin
Files:
5 edited

Legend:

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

    r18867 r18889  
    160160do_action('do_meta_boxes', $post_type, 'side', $post); 
    161161 
    162 $current_screen->add_option('layout_columns', array('max' => 2, 'default' => 'auto') ); 
     162$current_screen->add_option('layout_columns', array('max' => 2, 'default' => 2) ); 
    163163 
    164164$current_screen->add_option_context(  
  • trunk/wp-admin/edit-link-form.php

    r18867 r18889  
    3838do_action('do_meta_boxes', 'link', 'side', $link); 
    3939 
    40 $current_screen->add_option('layout_columns', array('max' => 2, 'default' => 'auto') ); 
     40$current_screen->add_option('layout_columns', array('max' => 2, 'default' => 2) ); 
    4141 
    4242$current_screen->add_option_context(  
  • trunk/wp-admin/includes/screen.php

    r18879 r18889  
    673673        $num = $this->_options['layout_columns']['max']; 
    674674 
    675         if ( ! $screen_layout_columns ) { 
     675        if ( ! $screen_layout_columns || 'auto' == $screen_layout_columns ) { 
    676676            if ( isset( $this->_options['layout_columns']['default'] ) ) 
    677677                $screen_layout_columns = $this->_options['layout_columns']['default']; 
    678             else 
    679                 $screen_layout_columns = 'auto'; 
    680678        } 
    681679 
     
    693691                <?php 
    694692            endfor; ?> 
    695             <label> 
    696                 <input type='radio' id='wp_auto_columns' name='screen_columns' value='auto' 
    697                     <?php checked( $screen_layout_columns, 'auto' ); ?> /> 
    698                 <?php esc_html_e('Auto'); ?> 
    699             </label> 
    700693        </div> 
    701694        <?php 
  • trunk/wp-admin/index.php

    r18867 r18889  
    2626    $current_screen->add_option('layout_columns', array('max' => 4, 'default' => 1) ); 
    2727else 
    28     $current_screen->add_option('layout_columns', array('max' => 4, 'default' => 'auto') ); 
     28    $current_screen->add_option('layout_columns', array('max' => 4, 'default' => 2) ); 
    2929 
    3030$current_screen->add_option_context(  
  • trunk/wp-admin/network/index.php

    r18867 r18889  
    3939add_thickbox(); 
    4040 
    41 $current_screen->add_option('layout_columns', array('max' => 4, 'default' => 'auto') ); 
     41$current_screen->add_option('layout_columns', array('max' => 4, 'default' => 2) ); 
    4242 
    4343$current_screen->add_option_context(  
Note: See TracChangeset for help on using the changeset viewer.