<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[18889] trunk/wp-admin: Revert 'auto' column setting, props markjaquith, see #18863</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/18889">18889</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2011-10-05 18:46:21 +0000 (Wed, 05 Oct 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Revert 'auto' column setting, props markjaquith, see <a href="http://core.trac.wordpress.org/ticket/18863">#18863</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadmineditformadvancedphp">trunk/wp-admin/edit-form-advanced.php</a></li>
<li><a href="#trunkwpadmineditlinkformphp">trunk/wp-admin/edit-link-form.php</a></li>
<li><a href="#trunkwpadminincludesscreenphp">trunk/wp-admin/includes/screen.php</a></li>
<li><a href="#trunkwpadminindexphp">trunk/wp-admin/index.php</a></li>
<li><a href="#trunkwpadminnetworkindexphp">trunk/wp-admin/network/index.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadmineditformadvancedphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit-form-advanced.php (18888 => 18889)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-form-advanced.php 2011-10-05 18:45:32 UTC (rev 18888)
+++ trunk/wp-admin/edit-form-advanced.php 2011-10-05 18:46:21 UTC (rev 18889)
</span><span class="lines">@@ -159,7 +159,7 @@
</span><span class="cx"> do_action('do_meta_boxes', $post_type, 'advanced', $post);
</span><span class="cx"> do_action('do_meta_boxes', $post_type, 'side', $post);
</span><span class="cx">
</span><del>-$current_screen->add_option('layout_columns', array('max' => 2, 'default' => 'auto') );
</del><ins>+$current_screen->add_option('layout_columns', array('max' => 2, 'default' => 2) );
</ins><span class="cx">
</span><span class="cx"> $current_screen->add_option_context(
</span><span class="cx"> '<p>test</p>'
</span></span></pre></div>
<a id="trunkwpadmineditlinkformphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit-link-form.php (18888 => 18889)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-link-form.php 2011-10-05 18:45:32 UTC (rev 18888)
+++ trunk/wp-admin/edit-link-form.php 2011-10-05 18:46:21 UTC (rev 18889)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx"> do_action('do_meta_boxes', 'link', 'advanced', $link);
</span><span class="cx"> do_action('do_meta_boxes', 'link', 'side', $link);
</span><span class="cx">
</span><del>-$current_screen->add_option('layout_columns', array('max' => 2, 'default' => 'auto') );
</del><ins>+$current_screen->add_option('layout_columns', array('max' => 2, 'default' => 2) );
</ins><span class="cx">
</span><span class="cx"> $current_screen->add_option_context(
</span><span class="cx"> '<p>test</p>'
</span></span></pre></div>
<a id="trunkwpadminincludesscreenphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/screen.php (18888 => 18889)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/screen.php 2011-10-05 18:45:32 UTC (rev 18888)
+++ trunk/wp-admin/includes/screen.php 2011-10-05 18:46:21 UTC (rev 18889)
</span><span class="lines">@@ -672,11 +672,9 @@
</span><span class="cx"> $screen_layout_columns = get_user_option("screen_layout_$this->id");
</span><span class="cx"> $num = $this->_options['layout_columns']['max'];
</span><span class="cx">
</span><del>- if ( ! $screen_layout_columns ) {
</del><ins>+ if ( ! $screen_layout_columns || 'auto' == $screen_layout_columns ) {
</ins><span class="cx"> if ( isset( $this->_options['layout_columns']['default'] ) )
</span><span class="cx"> $screen_layout_columns = $this->_options['layout_columns']['default'];
</span><del>- else
- $screen_layout_columns = 'auto';
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ?>
</span><span class="lines">@@ -692,11 +690,6 @@
</span><span class="cx"> </label>
</span><span class="cx"> <?php
</span><span class="cx"> endfor; ?>
</span><del>- <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>
</del><span class="cx"> </div>
</span><span class="cx"> <?php
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpadminindexphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/index.php (18888 => 18889)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/index.php 2011-10-05 18:45:32 UTC (rev 18888)
+++ trunk/wp-admin/index.php 2011-10-05 18:46:21 UTC (rev 18889)
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx"> if ( is_user_admin() )
</span><span class="cx"> $current_screen->add_option('layout_columns', array('max' => 4, 'default' => 1) );
</span><span class="cx"> else
</span><del>- $current_screen->add_option('layout_columns', array('max' => 4, 'default' => 'auto') );
</del><ins>+ $current_screen->add_option('layout_columns', array('max' => 4, 'default' => 2) );
</ins><span class="cx">
</span><span class="cx"> $current_screen->add_option_context(
</span><span class="cx"> '<p>test</p>'
</span></span></pre></div>
<a id="trunkwpadminnetworkindexphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/index.php (18888 => 18889)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/index.php 2011-10-05 18:45:32 UTC (rev 18888)
+++ trunk/wp-admin/network/index.php 2011-10-05 18:46:21 UTC (rev 18889)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> wp_enqueue_script( 'plugin-install' );
</span><span class="cx"> add_thickbox();
</span><span class="cx">
</span><del>-$current_screen->add_option('layout_columns', array('max' => 4, 'default' => 'auto') );
</del><ins>+$current_screen->add_option('layout_columns', array('max' => 4, 'default' => 2) );
</ins><span class="cx">
</span><span class="cx"> $current_screen->add_option_context(
</span><span class="cx"> '<p>test</p>'
</span></span></pre>
</div>
</div>
</body>
</html>