<!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>[16213] trunk/wp-includes: Revert [16021].</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16213">16213</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-11-05 21:35:28 +0000 (Fri, 05 Nov 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Revert <a href="http://trac.wordpress.org/changeset/16021">[16021]</a>. See <a href="http://trac.wordpress.org/ticket/14170">#14170</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesmsdefaultfiltersphp">trunk/wp-includes/ms-default-filters.php</a></li>
<li><a href="#trunkwpincludesmsfunctionsphp">trunk/wp-includes/ms-functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesmsdefaultfiltersphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ms-default-filters.php (16212 => 16213)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ms-default-filters.php 2010-11-05 21:16:46 UTC (rev 16212)
+++ trunk/wp-includes/ms-default-filters.php 2010-11-05 21:35:28 UTC (rev 16213)
</span><span class="lines">@@ -22,7 +22,6 @@
</span><span class="cx">
</span><span class="cx"> // Blogs
</span><span class="cx"> add_filter( 'wpmu_validate_blog_signup', 'signup_nonce_check' );
</span><del>-add_action( 'wpmu_new_blog', 'wpmu_activate_network_plugins', 9 );
</del><span class="cx"> add_action( 'wpmu_new_blog', 'wpmu_log_new_registrations', 10, 2 );
</span><span class="cx"> add_action( 'wpmu_new_blog', 'newblog_notify_siteadmin', 10, 2 );
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesmsfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ms-functions.php (16212 => 16213)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ms-functions.php 2010-11-05 21:16:46 UTC (rev 16212)
+++ trunk/wp-includes/ms-functions.php 2010-11-05 21:35:28 UTC (rev 16213)
</span><span class="lines">@@ -1224,26 +1224,6 @@
</span><span class="cx"> update_option( 'post_count', (int) $wpdb->get_var( "SELECT COUNT(ID) FROM {$wpdb->posts} WHERE post_status = 'publish' and post_type = 'post'" ) );
</span><span class="cx"> }
</span><span class="cx">
</span><del>-/**
- * Fires activation hooks for all active network plugins
- *
- * @since 3.1.0
- *
- * @param int $blog_id Blog ID
- */
-function wpmu_activate_network_plugins( $blog_id ) {
- switch_to_blog( $blog_id );
-
- $active_sitewide_plugins = (array) get_site_option( 'active_sitewide_plugins', array() );
-
- foreach ( array_keys( $active_sitewide_plugins ) as $plugin ) {
- do_action( 'activate_' . $plugin, false );
- do_action( 'activate_plugin', $plugin, false );
- }
-
- restore_current_blog();
-}
-
</del><span class="cx"> function wpmu_log_new_registrations( $blog_id, $user_id ) {
</span><span class="cx"> global $wpdb;
</span><span class="cx"> $user = new WP_User( (int) $user_id );
</span></span></pre>
</div>
</div>
</body>
</html>