golem
/
twentyGOLEM
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

git-svn-id: http://svn.automattic.com/wordpress/trunk@18889 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
azaozz 2011-10-05 18:46:21 +00:00
parent dcf34868ed
commit f9ebf31d4a
5 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-admin/edit-form-advanced.php
View File

@ -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, 'advanced', $post);
do_action('do_meta_boxes', $post_type, 'side', $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( $current_screen->add_option_context(
'<p>test</p>' '<p>test</p>'

2
wp-admin/edit-link-form.php
View File

@ -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', 'advanced', $link);
do_action('do_meta_boxes', 'link', 'side', $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( $current_screen->add_option_context(
'<p>test</p>' '<p>test</p>'

9
wp-admin/includes/screen.php
View File

@ -672,11 +672,9 @@ final class WP_Screen {
$screen_layout_columns = get_user_option("screen_layout_$this->id"); $screen_layout_columns = get_user_option("screen_layout_$this->id");
$num = $this->_options['layout_columns']['max']; $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'] ) ) if ( isset( $this->_options['layout_columns']['default'] ) )
$screen_layout_columns = $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> </label>
<?php <?php
endfor; ?> 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> </div>
<?php <?php
} }

2
wp-admin/index.php
View File

@ -25,7 +25,7 @@ $parent_file = 'index.php';
if ( is_user_admin() ) if ( is_user_admin() )
$current_screen->add_option('layout_columns', array('max' => 4, 'default' => 1) ); $current_screen->add_option('layout_columns', array('max' => 4, 'default' => 1) );
else 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( $current_screen->add_option_context(
'<p>test</p>' '<p>test</p>'

2
wp-admin/network/index.php
View File

@ -38,7 +38,7 @@ wp_enqueue_script( 'dashboard' );
wp_enqueue_script( 'plugin-install' ); wp_enqueue_script( 'plugin-install' );
add_thickbox(); 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( $current_screen->add_option_context(
'<p>test</p>' '<p>test</p>'