<!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>[14218] trunk: Fix DB upgrade kickoff for removal of usermeta fields.</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14218">14218</a></dd>
<dt>Author</dt> <dd>dd32</dd>
<dt>Date</dt> <dd>2010-04-24 10:29:01 +0000 (Sat, 24 Apr 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>Fix DB upgrade kickoff for removal of usermeta fields. See r14212, r14213, see <a href="http://trac.wordpress.org/ticket/13032">#13032</a></pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesupgradephp">trunk/wp-admin/includes/upgrade.php</a></li>
<li><a href="#trunkwpincludesversionphp">trunk/wp-includes/version.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesupgradephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/upgrade.php (14217 => 14218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/upgrade.php        2010-04-24 06:04:05 UTC (rev 14217)
+++ trunk/wp-admin/includes/upgrade.php        2010-04-24 10:29:01 UTC (rev 14218)
</span><span class="lines">@@ -440,7 +440,7 @@
</span><span class="cx">         if ( $wp_current_db_version &lt; 11958 )
</span><span class="cx">                 upgrade_290();
</span><span class="cx"> 
</span><del>-        if ( $wp_current_db_version &lt; 14139 )
</del><ins>+        if ( $wp_current_db_version &lt; 14217 )
</ins><span class="cx">                 upgrade_300();
</span><span class="cx"> 
</span><span class="cx">         maybe_disable_automattic_widgets();
</span><span class="lines">@@ -1136,7 +1136,7 @@
</span><span class="cx">                 $wpdb-&gt;update( $wpdb-&gt;postmeta, array( 'meta_value' =&gt; '' ), array( 'meta_key' =&gt; '_menu_item_target', 'meta_value' =&gt; '_self' ) );
</span><span class="cx"> 
</span><span class="cx">         // 3.0-beta metabox changes. can be removed before release. // r13551
</span><del>-        if ( ( !is_multisite() || is_main_site() ) &amp;&amp; $wp_current_db_version &gt;= 13309 &amp;&amp; $wp_current_db_version &lt; 14139 )
</del><ins>+        if ( ( !is_multisite() || is_main_site() ) &amp;&amp; $wp_current_db_version &gt;= 13309 &amp;&amp; $wp_current_db_version &lt; 14217 )
</ins><span class="cx">                 $wpdb-&gt;query( &quot;DELETE FROM $wpdb-&gt;usermeta WHERE meta_key LIKE '{$wpdb-&gt;base_prefix}%meta-box-hidden%' OR meta_key LIKE '{$wpdb-&gt;base_prefix}%closedpostboxes%'&quot; );
</span><span class="cx"> 
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpincludesversionphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/version.php (14217 => 14218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/version.php        2010-04-24 06:04:05 UTC (rev 14217)
+++ trunk/wp-includes/version.php        2010-04-24 10:29:01 UTC (rev 14218)
</span><span class="lines">@@ -15,7 +15,7 @@
</span><span class="cx">  *
</span><span class="cx">  * @global int $wp_db_version
</span><span class="cx">  */
</span><del>-$wp_db_version = 14139;
</del><ins>+$wp_db_version = 14217;
</ins><span class="cx"> 
</span><span class="cx"> /**
</span><span class="cx">  * Holds the TinyMCE version
</span></span></pre>
</div>
</div>

</body>
</html>