From 22f4cdc7d78d7856f420437b1c2e97d30f5ca305 Mon Sep 17 00:00:00 2001
From: Andrew Ozz <azaozz@git.wordpress.org>
Date: Wed, 5 Oct 2011 18:46:21 +0000
Subject: [PATCH] Revert 'auto' column setting, props markjaquith, see #18863

git-svn-id: https://develop.svn.wordpress.org/trunk@18889 602fd350-edb4-49c9-b593-d223f7449a82
---
 wp-admin/edit-form-advanced.php | 2 +-
 wp-admin/edit-link-form.php     | 2 +-
 wp-admin/includes/screen.php    | 9 +--------
 wp-admin/index.php              | 2 +-
 wp-admin/network/index.php      | 2 +-
 5 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/wp-admin/edit-form-advanced.php b/wp-admin/edit-form-advanced.php
index d2f6d2db7c..53144863bb 100644
--- a/wp-admin/edit-form-advanced.php
+++ b/wp-admin/edit-form-advanced.php
@@ -159,7 +159,7 @@ do_action('do_meta_boxes', $post_type, 'normal', $post);
 do_action('do_meta_boxes', $post_type, 'advanced', $post);
 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( 
 '<p>test</p>'
diff --git a/wp-admin/edit-link-form.php b/wp-admin/edit-link-form.php
index cda296a022..dbad74d452 100644
--- a/wp-admin/edit-link-form.php
+++ b/wp-admin/edit-link-form.php
@@ -37,7 +37,7 @@ do_action('do_meta_boxes', 'link', 'normal', $link);
 do_action('do_meta_boxes', 'link', 'advanced', $link);
 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( 
 '<p>test</p>'
diff --git a/wp-admin/includes/screen.php b/wp-admin/includes/screen.php
index 324878e598..c0134ed9b9 100644
--- a/wp-admin/includes/screen.php
+++ b/wp-admin/includes/screen.php
@@ -672,11 +672,9 @@ final class WP_Screen {
 		$screen_layout_columns = get_user_option("screen_layout_$this->id");
 		$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';
 		}
 
 		?>
@@ -692,11 +690,6 @@ final class WP_Screen {
 				</label>
 				<?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
 	}
diff --git a/wp-admin/index.php b/wp-admin/index.php
index f42ec68d1b..01de4929bf 100644
--- a/wp-admin/index.php
+++ b/wp-admin/index.php
@@ -25,7 +25,7 @@ $parent_file = 'index.php';
 if ( is_user_admin() )
 	$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( 
 '<p>test</p>'
diff --git a/wp-admin/network/index.php b/wp-admin/network/index.php
index 5a202f634f..da9a4d485c 100644
--- a/wp-admin/network/index.php
+++ b/wp-admin/network/index.php
@@ -38,7 +38,7 @@ wp_enqueue_script( 'dashboard' );
 wp_enqueue_script( 'plugin-install' );
 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( 
 '<p>test</p>'