<!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>[13618] trunk: move multisite upgrade functions to upgrade.php, see #11771</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13618">13618</a></dd>
<dt>Author</dt> <dd>wpmuguru</dd>
<dt>Date</dt> <dd>2010-03-08 16:31:12 +0000 (Mon, 08 Mar 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>move multisite upgrade functions to upgrade.php, see <a href="http://trac.wordpress.org/ticket/11771">#11771</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesmsphp">trunk/wp-admin/includes/ms.php</a></li>
<li><a href="#trunkwpadminincludesupgradephp">trunk/wp-admin/includes/upgrade.php</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#trunk">trunk/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunk"></a>
<div class="propset"><h4>Property changes: trunk</h4>
<pre class="diff"><span>
<span class="cx">Name: svn:ignore
</span><span class="cx"> + .empty.php.swp
</span></span></pre></div>
<a id="trunkwpadminincludesmsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/ms.php (13617 => 13618)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/ms.php 2010-03-08 14:30:17 UTC (rev 13617)
+++ trunk/wp-admin/includes/ms.php 2010-03-08 16:31:12 UTC (rev 13618)
</span><span class="lines">@@ -734,40 +734,6 @@
</span><span class="cx"> <?php
</span><span class="cx"> }
</span><span class="cx">
</span><del>-function stripslashes_from_options( $blog_id ) {
- global $wpdb;
-
- if ( $blog_id == 1 ) { // check site_options too
- $start = 0;
- while( $rows = $wpdb->get_results( "SELECT meta_key, meta_value FROM {$wpdb->sitemeta} ORDER BY meta_id LIMIT $start, 20" ) ) {
- foreach( $rows as $row ) {
- $value = $row->meta_value;
- if ( !@unserialize( $value ) )
- $value = stripslashes( $value );
- if ( $value !== $row->meta_value ) {
- update_site_option( $row->meta_key, $value );
- }
- }
- $start += 20;
- }
- }
- $start = 0;
- $options_table = $wpdb->get_blog_prefix( $blog_id ) . "options";
- while( $rows = $wpdb->get_results( "SELECT option_name, option_value FROM $options_table ORDER BY option_id LIMIT $start, 20" ) ) {
- foreach( $rows as $row ) {
- $value = $row->option_value;
- if ( !@unserialize( $value ) )
- $value = stripslashes( $value );
- if ( $value !== $row->option_value ) {
- update_blog_option( $blog_id, $row->option_name, $value );
- }
- }
- $start += 20;
- }
- refresh_blog_details( $blog_id );
-}
-add_action( 'wpmu_upgrade_site', 'stripslashes_from_options' );
-
</del><span class="cx"> function show_post_thumbnail_warning() {
</span><span class="cx"> if ( ! is_super_admin() )
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkwpadminincludesupgradephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/upgrade.php (13617 => 13618)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/upgrade.php 2010-03-08 14:30:17 UTC (rev 13617)
+++ trunk/wp-admin/includes/upgrade.php 2010-03-08 16:31:12 UTC (rev 13618)
</span><span class="lines">@@ -1061,10 +1061,25 @@
</span><span class="cx"> * @since 2.8.0
</span><span class="cx"> */
</span><span class="cx"> function upgrade_280() {
</span><del>- global $wp_current_db_version;
</del><ins>+ global $wp_current_db_version, $wpdb;
</ins><span class="cx">
</span><span class="cx"> if ( $wp_current_db_version < 10360 )
</span><span class="cx"> populate_roles_280();
</span><ins>+ if ( is_multisite() ) {
+ $start = 0;
+ while( $rows = $wpdb->get_results( "SELECT option_name, option_value FROM $wpdb->options ORDER BY option_id LIMIT $start, 20" ) ) {
+ foreach( $rows as $row ) {
+ $value = $row->option_value;
+ if ( !@unserialize( $value ) )
+ $value = stripslashes( $value );
+ if ( $value !== $row->option_value ) {
+ update_option( $row->option_name, $value );
+ }
+ }
+ $start += 20;
+ }
+ refresh_blog_details( $wpdb->blogid );
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -1105,7 +1120,7 @@
</span><span class="cx"> * @since 3.0.0
</span><span class="cx"> */
</span><span class="cx"> function upgrade_network() {
</span><del>- global $wp_current_db_version;
</del><ins>+ global $wp_current_db_version, $wpdb;
</ins><span class="cx"> // 2.8
</span><span class="cx"> if ( $wp_current_db_version < 11549 ) {
</span><span class="cx"> $wpmu_sitewide_plugins = get_site_option( 'wpmu_sitewide_plugins' );
</span><span class="lines">@@ -1120,6 +1135,19 @@
</span><span class="cx"> }
</span><span class="cx"> delete_site_option( 'wpmu_sitewide_plugins' );
</span><span class="cx"> delete_site_option( 'deactivated_sitewide_plugins' );
</span><ins>+
+ $start = 0;
+ while( $rows = $wpdb->get_results( "SELECT meta_key, meta_value FROM {$wpdb->sitemeta} ORDER BY meta_id LIMIT $start, 20" ) ) {
+ foreach( $rows as $row ) {
+ $value = $row->meta_value;
+ if ( !@unserialize( $value ) )
+ $value = stripslashes( $value );
+ if ( $value !== $row->meta_value ) {
+ update_site_option( $row->meta_key, $value );
+ }
+ }
+ $start += 20;
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>