Changeset 18889

Timestamp:

10/05/2011 06:46:21 PM (13 years ago)

Author:

azaozz

Message:

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

Location:

trunk/wp-admin

Files:

• edit-form-advanced.php (modified) (1 diff)
• edit-link-form.php (modified) (1 diff)
• includes/screen.php (modified) (2 diffs)
• index.php (modified) (1 diff)
• network/index.php (modified) (1 diff)

trunk/wp-admin/edit-form-advanced.php

@@ -160 +160 @@
 do_action('do_meta_boxes', $post_type, 'side', $post);
 
-$current_screen->add_option('layout_columns', array('max' => 2, 'default' => 'auto') );
+$current_screen->add_option('layout_columns', array('max' => 2, 'default' => 2) );
 
 $current_screen->add_option_context( 

trunk/wp-admin/edit-link-form.php

@@ -38 +38 @@
 do_action('do_meta_boxes', 'link', 'side', $link);
 
-$current_screen->add_option('layout_columns', array('max' => 2, 'default' => 'auto') );
+$current_screen->add_option('layout_columns', array('max' => 2, 'default' => 2) );
 
 $current_screen->add_option_context( 

trunk/wp-admin/includes/screen.php

@@ -673 +673 @@
         $num = $this->_options['layout_columns']['max'];
 
-        if ( ! $screen_layout_columns ) {
+        if ( ! $screen_layout_columns || 'auto' == $screen_layout_columns ) {
             if ( isset( $this->_options['layout_columns']['default'] ) )
                 $screen_layout_columns = $this->_options['layout_columns']['default'];
-            else
-                $screen_layout_columns = 'auto';
         }
 
@@ -693 +691 @@
                 <?php
             endfor; ?>
-            <label>
-                <input type='radio' id='wp_auto_columns' name='screen_columns' value='auto'
-                    <?php checked( $screen_layout_columns, 'auto' ); ?> />
-                <?php esc_html_e('Auto'); ?>
-            </label>
         </div>
         <?php

trunk/wp-admin/index.php

@@ -26 +26 @@
     $current_screen->add_option('layout_columns', array('max' => 4, 'default' => 1) );
 else
-    $current_screen->add_option('layout_columns', array('max' => 4, 'default' => 'auto') );
+    $current_screen->add_option('layout_columns', array('max' => 4, 'default' => 2) );
 
 $current_screen->add_option_context( 

trunk/wp-admin/network/index.php

@@ -39 +39 @@
 add_thickbox();
 
-$current_screen->add_option('layout_columns', array('max' => 4, 'default' => 'auto') );
+$current_screen->add_option('layout_columns', array('max' => 4, 'default' => 2) );
 
 $current_screen->add_option_context(