<!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>[12888] trunk/wp-includes: Clean up cache re-init code in Multisite.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12888">12888</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-01-28 17:28:44 +0000 (Thu, 28 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Clean up cache re-init code in Multisite. Props nacin. fixes <a href="http://trac.wordpress.org/ticket/12065">#12065</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesloadphp">trunk/wp-includes/load.php</a></li>
<li><a href="#trunkwpincludesmssettingsphp">trunk/wp-includes/ms-settings.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesloadphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/load.php (12887 => 12888)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/load.php 2010-01-28 17:21:26 UTC (rev 12887)
+++ trunk/wp-includes/load.php 2010-01-28 17:28:44 UTC (rev 12888)
</span><span class="lines">@@ -318,13 +318,15 @@
</span><span class="cx"> * @since 3.0.0
</span><span class="cx"> */
</span><span class="cx"> function wp_start_object_cache() {
</span><del>- global $_wp_using_ext_object_cache;
- if ( file_exists( WP_CONTENT_DIR . '/object-cache.php' ) ) {
- require_once ( WP_CONTENT_DIR . '/object-cache.php' );
- $_wp_using_ext_object_cache = true;
- } else {
- require_once ( ABSPATH . WPINC . '/cache.php' );
- $_wp_using_ext_object_cache = false;
</del><ins>+ if ( ! function_exists( 'wp_cache_init' ) ) {
+ global $_wp_using_ext_object_cache;
+ if ( file_exists( WP_CONTENT_DIR . '/object-cache.php' ) ) {
+ require_once ( WP_CONTENT_DIR . '/object-cache.php' );
+ $_wp_using_ext_object_cache = true;
+ } else {
+ require_once ( ABSPATH . WPINC . '/cache.php' );
+ $_wp_using_ext_object_cache = false;
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> wp_cache_init();
</span></span></pre></div>
<a id="trunkwpincludesmssettingsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ms-settings.php (12887 => 12888)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ms-settings.php 2010-01-28 17:21:26 UTC (rev 12887)
+++ trunk/wp-includes/ms-settings.php 2010-01-28 17:28:44 UTC (rev 12888)
</span><span class="lines">@@ -152,11 +152,8 @@
</span><span class="cx"> if ( empty($PHP_SELF) || ( empty($PHP_SELF) && !is_subdomain_install() && $current_blog->path != '/' ) )
</span><span class="cx"> $_SERVER['PHP_SELF'] = $PHP_SELF = preg_replace("/(\?.*)?$/",'',$_SERVER["REQUEST_URI"]);
</span><span class="cx">
</span><del>-wp_cache_init(); // need to init cache again after blog_id is set
-if ( function_exists('wp_cache_add_global_groups') ) { // need to add these again. Yes, it's an ugly hack
- wp_cache_add_global_groups(array ('users', 'userlogins', 'usermeta', 'site-options', 'site-lookup', 'blog-lookup', 'blog-details', 'rss'));
- wp_cache_add_non_persistent_groups(array( 'comment', 'counts', 'plugins' ));
-}
</del><ins>+// need to init cache again after blog_id is set
+wp_start_object_cache();
</ins><span class="cx">
</span><span class="cx"> ms_default_constants( 'uploads' );
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>