<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[14235] trunk/wp-admin:
Fix back compat for hidden columns and layout screen options.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14235">14235</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-04-25 15:59:03 +0000 (Sun, 25 Apr 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix back compat for hidden columns and layout screen options. Change meta baox order to be per user, rather than per blog. This breaks back compat for box order but the previous behavior was wrong. see <a href="http://trac.wordpress.org/ticket/13032">#13032</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminadminajaxphp">trunk/wp-admin/admin-ajax.php</a></li>
<li><a href="#trunkwpadminincludestemplatephp">trunk/wp-admin/includes/template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminadminajaxphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/admin-ajax.php (14234 => 14235)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/admin-ajax.php 2010-04-25 15:25:00 UTC (rev 14234)
+++ trunk/wp-admin/admin-ajax.php 2010-04-25 15:59:03 UTC (rev 14235)
</span><span class="lines">@@ -1029,7 +1029,7 @@
</span><span class="cx"> die('-1');
</span><span class="cx">
</span><span class="cx"> if ( is_array($hidden) )
</span><del>- update_user_option($user->ID, "manage-$page-columns-hidden", $hidden);
</del><ins>+ update_user_option($user->ID, "manage{$page}columnshidden", $hidden, true);
</ins><span class="cx">
</span><span class="cx"> die('1');
</span><span class="cx"> break;
</span><span class="lines">@@ -1046,10 +1046,10 @@
</span><span class="cx"> die('-1');
</span><span class="cx">
</span><span class="cx"> if ( $order )
</span><del>- update_user_option($user->ID, "meta-box-order_$page", $order);
</del><ins>+ update_user_option($user->ID, "meta-box-order_$page", $order, true);
</ins><span class="cx">
</span><span class="cx"> if ( $page_columns )
</span><del>- update_user_option($user->ID, "screen_layout_$page", $page_columns);
</del><ins>+ update_user_option($user->ID, "screen_layout_$page", $page_columns, true);
</ins><span class="cx">
</span><span class="cx"> die('1');
</span><span class="cx"> break;
</span></span></pre></div>
<a id="trunkwpadminincludestemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/template.php (14234 => 14235)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/template.php 2010-04-25 15:25:00 UTC (rev 14234)
+++ trunk/wp-admin/includes/template.php 2010-04-25 15:59:03 UTC (rev 14235)
</span><span class="lines">@@ -834,7 +834,7 @@
</span><span class="cx"> if ( is_string($screen) )
</span><span class="cx"> $screen = convert_to_screen($screen);
</span><span class="cx">
</span><del>- return (array) get_user_option( 'manage-' . $screen->id. '-columns-hidden' );
</del><ins>+ return (array) get_user_option( 'manage' . $screen->id. 'columnshidden' );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre>
</div>
</div>
</body>
</html>