<!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>[13125] trunk: Move blogs table related functions to blogs.php.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13125">13125</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-02-13 22:35:11 +0000 (Sat, 13 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move blogs table related functions to blogs.php. Include it before ms-settings.php so that caching API can be used instead of direct queries. see <a href="http://trac.wordpress.org/ticket/11644">#11644</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesmsfunctionsphp">trunk/wp-includes/ms-functions.php</a></li>
<li><a href="#trunkwpsettingsphp">trunk/wp-settings.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkwpincludesblogsphp">trunk/wp-includes/blogs.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesblogsphp"></a>
<div class="addfile"><h4>Added: trunk/wp-includes/blogs.php (0 => 13125)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/blogs.php (rev 0)
+++ trunk/wp-includes/blogs.php 2010-02-13 22:35:11 UTC (rev 13125)
</span><span class="lines">@@ -0,0 +1,500 @@
</span><ins>+<?php
+
+/**
+ * Site/blog functions that work with the blogs table and related data.
+ *
+ * @package WordPress
+ * @subpackage Site
+ * @since 3.0.0
+ */
+
+// @todo use update_blog_details
+function wpmu_update_blogs_date() {
+ global $wpdb;
+
+ $wpdb->update( $wpdb->blogs, array('last_updated' => current_time('mysql', true)), array('blog_id' => $wpdb->blogid) );
+ refresh_blog_details( $wpdb->blogid );
+
+ do_action( 'wpmu_blog_updated', $wpdb->blogid );
+}
+
+function get_blogaddress_by_id( $blog_id ) {
+ $bloginfo = get_blog_details( (int) $blog_id, false ); // only get bare details!
+ return esc_url( 'http://' . $bloginfo->domain . $bloginfo->path );
+}
+
+function get_blogaddress_by_name( $blogname ) {
+ global $current_site;
+
+ if ( is_subdomain_install() ) {
+ if ( $blogname == 'main' )
+ $blogname = 'www';
+ return esc_url( 'http://' . $blogname . '.' . $current_site->domain . $current_site->path );
+ } else {
+ return esc_url( 'http://' . $current_site->domain . $current_site->path . $blogname . '/' );
+ }
+}
+
+function get_blogaddress_by_domain( $domain, $path ){
+ if ( is_subdomain_install() ) {
+ $url = "http://".$domain.$path;
+ } else {
+ if ( $domain != $_SERVER['HTTP_HOST'] ) {
+ $blogname = substr( $domain, 0, strpos( $domain, '.' ) );
+ $url = 'http://' . substr( $domain, strpos( $domain, '.' ) + 1 ) . $path;
+ // we're not installing the main blog
+ if ( $blogname != 'www.' )
+ $url .= $blogname . '/';
+ } else { // main blog
+ $url = 'http://' . $domain . $path;
+ }
+ }
+ return esc_url( $url );
+}
+
+function get_id_from_blogname( $name ) {
+ global $wpdb, $current_site;
+ $blog_id = wp_cache_get( "get_id_from_blogname_" . $name, 'blog-details' );
+ if ( $blog_id )
+ return $blog_id;
+
+ if ( is_subdomain_install() ) {
+ $domain = $name . '.' . $current_site->domain;
+ $path = $current_site->path;
+ } else {
+ $domain = $current_site->domain;
+ $path = $current_site->path . $name . '/';
+ }
+ $blog_id = $wpdb->get_var( $wpdb->prepare("SELECT blog_id FROM {$wpdb->blogs} WHERE domain = %s AND path = %s", $domain, $path) );
+ wp_cache_set( 'get_id_from_blogname_' . $name, $blog_id, 'blog-details' );
+ return $blog_id;
+}
+
+/**
+ * Retrieve the details for a blog from the blogs table and blog options.
+ *
+ * @since 3.0
+ * @param int $blog_id Blog ID
+ * @param bool $get_all Whether to retrieve all details or only the details in the blogs table. Default is true.
+ * @return object Blog details.
+ */
+function get_blog_details( $blog_id, $get_all = true ) {
+ global $wpdb;
+
+ if ( !is_numeric( $blog_id ) )
+ $blog_id = get_id_from_blogname( $blog_id );
+
+ $blog_id = (int) $blog_id;
+
+ $all = $get_all == true ? '' : 'short';
+ $details = wp_cache_get( $blog_id . $all, 'blog-details' );
+
+ if ( $details ) {
+ if ( ! is_object( $details ) ) {
+ if ( $details == -1 )
+ return false;
+ else
+ // Clear old pre-serialized objects. Cache clients do better with that.
+ wp_cache_delete( $blog_id . $all, 'blog-details' );
+ }
+ return $details;
+ }
+
+ $details = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->blogs WHERE blog_id = %d", $blog_id ) );
+ if ( ! $details ) {
+ wp_cache_set( $blog_id . $all, -1, 'blog-details' );
+ return false;
+ }
+
+ if ( ! $get_all ) {
+ wp_cache_set( $blog_id . $all, $details, 'blog-details' );
+ return $details;
+ }
+
+ $details->blogname = get_blog_option( $blog_id, 'blogname' );
+ $details->siteurl = get_blog_option( $blog_id, 'siteurl' );
+ $details->post_count = get_blog_option( $blog_id, 'post_count' );
+
+ $details = apply_filters( 'blog_details', $details );
+
+ wp_cache_set( $blog_id . $all, $details, 'blog-details' );
+
+ $key = md5( $details->domain . $details->path );
+ wp_cache_set( $key, $details, 'blog-lookup' );
+
+ return $details;
+}
+
+/**
+ * Clear the blog details cache.
+ *
+ * @since 3.0
+ *
+ * @param int $blog_id Blog ID
+ */
+function refresh_blog_details( $blog_id ) {
+ $blog_id = (int) $blog_id;
+ $details = get_blog_details( $blog_id, false );
+
+ wp_cache_delete( $blog_id , 'blog-details' );
+ wp_cache_delete( $blog_id . 'short' , 'blog-details' );
+ wp_cache_delete( md5( $details->domain . $details->path ) , 'blog-lookup' );
+ wp_cache_delete( 'current_blog_' . $details->domain, 'site-options' );
+ wp_cache_delete( 'current_blog_' . $details->domain . $details->path, 'site-options' );
+}
+
+/**
+ * Update the details for a blog. Updates the blogs table for a given blog id.
+ *
+ * @since 3.0
+ *
+ * @param int $blog_id Blog ID
+ * @param array $details Array of details keyed by blogs table field names.
+ * @return bool True if update succeeds, false otherwise.
+ */
+function update_blog_details( $blog_id, $details = array() ) {
+ global $wpdb;
+
+ if ( empty($details) )
+ return false;
+
+ if ( is_object($details) )
+ $details = get_object_vars($details);
+
+ $current_details = get_blog_details($blog_id, false);
+ if ( empty($current_details) )
+ return false;
+
+ $current_details = get_object_vars($current_details);
+
+ $details = array_merge($current_details, $details);
+ $details['last_updated'] = current_time('mysql', true);
+
+ $update_details = array();
+ $fields = array( 'site_id', 'domain', 'path', 'registered', 'last_updated', 'public', 'archived', 'mature', 'spam', 'deleted', 'lang_id');
+ foreach ( array_intersect( array_keys( $details ), $fields ) as $field )
+ $update_details[$field] = $details[$field];
+
+ $result = $wpdb->update( $wpdb->blogs, $update_details, array('blog_id' => $blog_id) );
+
+ // If spam status changed, issue actions.
+ if ( $details[ 'spam' ] != $current_details[ 'spam' ] ) {
+ if ( $details[ 'spam' ] == 1 )
+ do_action( "make_spam_blog", $blog_id );
+ else
+ do_action( "make_ham_blog", $blog_id );
+ }
+
+ if ( isset($details[ 'public' ]) )
+ update_blog_option( $blog_id, 'blog_public', $details[ 'public' ], false );
+
+ refresh_blog_details($blog_id);
+
+ return true;
+}
+
+/**
+ * Retrieve option value based on setting name and blog_id.
+ *
+ * If the option does not exist or does not have a value, then the return value
+ * will be false. This is useful to check whether you need to install an option
+ * and is commonly used during installation of plugin options and to test
+ * whether upgrading is required.
+ *
+ * There is a filter called 'blog_option_$option' with the $option being
+ * replaced with the option name. The filter takes two parameters. $value and
+ * $blog_id. It returns $value.
+ * The 'option_$option' filter in get_option() is not called.
+ *
+ * @since NA
+ * @package WordPress MU
+ * @subpackage Option
+ * @uses apply_filters() Calls 'blog_option_$optionname' with the option name value.
+ *
+ * @param int $blog_id is the id of the blog.
+ * @param string $setting Name of option to retrieve. Should already be SQL-escaped
+ * @param string $default (optional) Default value returned if option not found.
+ * @return mixed Value set for the option.
+ */
+function get_blog_option( $blog_id, $setting, $default = false ) {
+ global $wpdb;
+
+ $key = $blog_id."-".$setting."-blog_option";
+ $value = wp_cache_get( $key, "site-options" );
+ if ( $value == null ) {
+ if ( $blog_id == $wpdb->blogid ) {
+ $value = get_option( $setting, $default );
+ $notoptions = wp_cache_get( 'notoptions', 'options' );
+ if ( isset( $notoptions[$setting] ) )
+ wp_cache_set( $key, 'noop', 'site-options' );
+ elseif ( $value == false )
+ wp_cache_set( $key, 'falsevalue', 'site-options' );
+ else
+ wp_cache_set( $key, $value, 'site-options' );
+ } else {
+ $blog_prefix = $wpdb->get_blog_prefix( $blog_id );
+ $row = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$blog_prefix}options WHERE option_name = %s", $setting ) );
+ if ( is_object( $row ) ) { // Has to be get_row instead of get_var because of funkiness with 0, false, null values
+ $value = $row->option_value;
+ if ( $value == false )
+ wp_cache_set( $key, 'falsevalue', 'site-options' );
+ else
+ wp_cache_set( $key, $value, 'site-options' );
+ } else { // option does not exist, so we must cache its non-existence
+ wp_cache_set( $key, 'noop', 'site-options' );
+ $value = $default;
+ }
+ }
+ } elseif ( $value == 'noop' ) {
+ $value = $default;
+ } elseif ( $value == 'falsevalue' ) {
+ $value = false;
+ }
+ // If home is not set use siteurl.
+ if ( 'home' == $setting && '' == $value )
+ return get_blog_option( $blog_id, 'siteurl' );
+
+ if ( 'siteurl' == $setting || 'home' == $setting || 'category_base' == $setting )
+ $value = untrailingslashit( $value );
+
+ if (! @unserialize( $value ) )
+ $value = stripslashes( $value );
+
+ return apply_filters( 'blog_option_' . $setting, maybe_unserialize( $value ), $blog_id );
+}
+
+function add_blog_option( $id, $key, $value ) {
+ $id = (int) $id;
+
+ switch_to_blog($id);
+ add_option( $key, $value );
+ restore_current_blog();
+ wp_cache_set( $id."-".$key."-blog_option", $value, 'site-options' );
+}
+
+function delete_blog_option( $id, $key ) {
+ $id = (int) $id;
+
+ switch_to_blog($id);
+ delete_option( $key );
+ restore_current_blog();
+ wp_cache_set( $id."-".$key."-blog_option", '', 'site-options' );
+}
+
+function update_blog_option( $id, $key, $value, $refresh = true ) {
+ $id = (int) $id;
+
+ switch_to_blog($id);
+ update_option( $key, $value );
+ restore_current_blog();
+
+ if ( $refresh == true )
+ refresh_blog_details( $id );
+ wp_cache_set( $id."-".$key."-blog_option", $value, 'site-options');
+}
+
+function switch_to_blog( $new_blog, $validate = false ) {
+ global $wpdb, $table_prefix, $blog_id, $switched, $switched_stack, $wp_roles, $current_user, $wp_object_cache;
+
+ if ( empty($new_blog) )
+ $new_blog = $blog_id;
+
+ if ( $validate && ! get_blog_details( $new_blog ) )
+ return false;
+
+ if ( empty($switched_stack) )
+ $switched_stack = array();
+
+ $switched_stack[] = $blog_id;
+
+ /* If we're switching to the same blog id that we're on,
+ * set the right vars, do the associated actions, but skip
+ * the extra unnecessary work */
+ if ( $blog_id == $new_blog ) {
+ do_action( 'switch_blog', $blog_id, $blog_id );
+ $switched = true;
+ return true;
+ }
+
+ $wpdb->set_blog_id($new_blog);
+ $table_prefix = $wpdb->prefix;
+ $prev_blog_id = $blog_id;
+ $blog_id = $new_blog;
+
+ if ( is_object( $wp_roles ) ) {
+ $wpdb->suppress_errors();
+ if ( method_exists( $wp_roles ,'_init' ) )
+ $wp_roles->_init();
+ elseif ( method_exists( $wp_roles, '__construct' ) )
+ $wp_roles->__construct();
+ $wpdb->suppress_errors( false );
+ }
+
+ if ( is_object( $current_user ) )
+ $current_user->for_blog( $blog_id );
+
+ if ( is_object( $wp_object_cache ) && isset( $wp_object_cache->global_groups ) )
+ $global_groups = $wp_object_cache->global_groups;
+ else
+ $global_groups = false;
+
+ wp_cache_init();
+ if ( function_exists('wp_cache_add_global_groups') ) {
+ if ( is_array( $global_groups ) )
+ wp_cache_add_global_groups( $global_groups );
+ else
+ wp_cache_add_global_groups( array( 'users', 'userlogins', 'usermeta', 'site-options', 'site-lookup', 'blog-lookup', 'blog-details', 'rss', 'site-transient', 'global-posts' ) );
+ wp_cache_add_non_persistent_groups(array( 'comment', 'counts', 'plugins' ));
+ }
+
+ do_action('switch_blog', $blog_id, $prev_blog_id);
+ $switched = true;
+ return true;
+}
+
+function restore_current_blog() {
+ global $table_prefix, $wpdb, $blog_id, $switched, $switched_stack, $wp_roles, $current_user, $wp_object_cache;
+
+ if ( !$switched )
+ return false;
+
+ if ( !is_array( $switched_stack ) )
+ return false;
+
+ $blog = array_pop( $switched_stack );
+ if ( $blog_id == $blog ) {
+ do_action( 'switch_blog', $blog, $blog );
+ /* If we still have items in the switched stack, consider ourselves still 'switched' */
+ $switched = ( is_array( $switched_stack ) && count( $switched_stack ) > 0 );
+ return true;
+ }
+
+ $wpdb->set_blog_id($blog);
+ $prev_blog_id = $blog_id;
+ $blog_id = $blog;
+ $table_prefix = $wpdb->prefix;
+
+ if ( is_object( $wp_roles ) ) {
+ $wpdb->suppress_errors();
+ if ( method_exists( $wp_roles ,'_init' ) )
+ $wp_roles->_init();
+ elseif ( method_exists( $wp_roles, '__construct' ) )
+ $wp_roles->__construct();
+ $wpdb->suppress_errors( false );
+ }
+
+ if ( is_object( $current_user ) )
+ $current_user->for_blog( $blog_id );
+
+ if ( is_object( $wp_object_cache ) && isset( $wp_object_cache->global_groups ) )
+ $global_groups = $wp_object_cache->global_groups;
+ else
+ $global_groups = false;
+
+ wp_cache_init();
+ if ( function_exists('wp_cache_add_global_groups') ) {
+ if ( is_array( $global_groups ) )
+ wp_cache_add_global_groups( $global_groups );
+ else
+ wp_cache_add_global_groups( array( 'users', 'userlogins', 'usermeta', 'site-options', 'site-lookup', 'blog-lookup', 'blog-details', 'rss', 'site-transient' ) );
+ wp_cache_add_non_persistent_groups(array( 'comment', 'counts', 'plugins' ));
+ }
+
+ do_action('switch_blog', $blog_id, $prev_blog_id);
+
+ /* If we still have items in the switched stack, consider ourselves still 'switched' */
+ $switched = ( is_array( $switched_stack ) && count( $switched_stack ) > 0 );
+ return true;
+}
+
+function is_archived( $id ) {
+ return get_blog_status($id, 'archived');
+}
+
+function update_archived( $id, $archived ) {
+ update_blog_status($id, 'archived', $archived);
+ return $archived;
+}
+
+/**
+ * Update a blog details field.
+ *
+ * @since 3.0
+ *
+ * @param int $blog_id BLog ID
+ * @param string $pref A field name
+ * @param string $value Value for $pref
+ * @param bool $refresh Whether to refresh the blog details cache. Default is true.
+ */
+function update_blog_status( $blog_id, $pref, $value, $refresh = true ) {
+ global $wpdb;
+
+ if ( !in_array( $pref, array( 'site_id', 'domain', 'path', 'registered', 'last_updated', 'public', 'archived', 'mature', 'spam', 'deleted', 'lang_id') ) )
+ return $value;
+
+ $wpdb->update( $wpdb->blogs, array($pref => $value, 'last_updated' => current_time('mysql', true)), array('blog_id' => $blog_id) );
+
+ if ( $refresh )
+ refresh_blog_details($blog_id);
+
+ if ( $pref == 'spam' ) {
+ if ( $value == 1 )
+ do_action( "make_spam_blog", $blog_id );
+ else
+ do_action( "make_ham_blog", $blog_id );
+ }
+
+ return $value;
+}
+
+function get_blog_status( $id, $pref ) {
+ global $wpdb;
+
+ $details = get_blog_details( $id, false );
+ if ( $details )
+ return $details->$pref;
+
+ return $wpdb->get_var( $wpdb->prepare("SELECT %s FROM {$wpdb->blogs} WHERE blog_id = %d", $pref, $id) );
+}
+
+function get_last_updated( $deprecated = '', $start = 0, $quantity = 40 ) {
+ global $wpdb;
+ return $wpdb->get_results( $wpdb->prepare("SELECT blog_id, domain, path FROM $wpdb->blogs WHERE site_id = %d AND public = '1' AND archived = '0' AND mature = '0' AND spam = '0' AND deleted = '0' AND last_updated != '0000-00-00 00:00:00' ORDER BY last_updated DESC limit %d, %d", $wpdb->siteid, $start, $quantity ) , ARRAY_A );
+}
+
+function get_blog_list( $start = 0, $num = 10, $deprecated = '' ) {
+ global $wpdb;
+
+ $blogs = get_site_option( "blog_list" );
+ $update = false;
+ if ( is_array( $blogs ) ) {
+ if ( ( $blogs['time'] + 60 ) < time() ) { // cache for 60 seconds.
+ $update = true;
+ }
+ } else {
+ $update = true;
+ }
+
+ if ( $update == true ) {
+ unset( $blogs );
+ $blogs = $wpdb->get_results( $wpdb->prepare("SELECT blog_id, domain, path FROM $wpdb->blogs WHERE site_id = %d AND public = '1' AND archived = '0' AND mature = '0' AND spam = '0' AND deleted = '0' ORDER BY registered DESC", $wpdb->siteid), ARRAY_A );
+
+ foreach ( (array) $blogs as $details ) {
+ $blog_list[ $details['blog_id'] ] = $details;
+ $blog_list[ $details['blog_id'] ]['postcount'] = $wpdb->get_var( "SELECT COUNT(ID) FROM " . $wpdb->base_prefix . $details['blog_id'] . "_posts WHERE post_status='publish' AND post_type='post'" );
+ }
+ unset( $blogs );
+ $blogs = $blog_list;
+ update_site_option( "blog_list", $blogs );
+ }
+
+ if ( false == is_array( $blogs ) )
+ return array();
+
+ if ( $num == 'all' )
+ return array_slice( $blogs, $start, count( $blogs ) );
+ else
+ return array_slice( $blogs, $start, $num );
+}
+
+?>
</ins><span class="cx">\ No newline at end of file
</span><span class="cx">Property changes on: trunk/wp-includes/blogs.php
</span><span class="cx">___________________________________________________________________
</span><span class="cx">Name: svn:eol-style
</span><span class="cx"> + native
</span></span></pre></div>
<a id="trunkwpincludesmsfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ms-functions.php (13124 => 13125)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ms-functions.php 2010-02-13 20:40:42 UTC (rev 13124)
+++ trunk/wp-includes/ms-functions.php 2010-02-13 22:35:11 UTC (rev 13125)
</span><span class="lines">@@ -5,50 +5,6 @@
</span><span class="cx"> * @package WordPress
</span><span class="cx"> */
</span><span class="cx">
</span><del>-// @todo use update_blog_details
-function wpmu_update_blogs_date() {
- global $wpdb;
-
- $wpdb->update( $wpdb->blogs, array('last_updated' => current_time('mysql', true)), array('blog_id' => $wpdb->blogid) );
- refresh_blog_details( $wpdb->blogid );
-
- do_action( 'wpmu_blog_updated', $wpdb->blogid );
-}
-
-function get_blogaddress_by_id( $blog_id ) {
- $bloginfo = get_blog_details( (int) $blog_id, false ); // only get bare details!
- return esc_url( 'http://' . $bloginfo->domain . $bloginfo->path );
-}
-
-function get_blogaddress_by_name( $blogname ) {
- global $current_site;
-
- if ( is_subdomain_install() ) {
- if ( $blogname == 'main' )
- $blogname = 'www';
- return esc_url( 'http://' . $blogname . '.' . $current_site->domain . $current_site->path );
- } else {
- return esc_url( 'http://' . $current_site->domain . $current_site->path . $blogname . '/' );
- }
-}
-
-function get_blogaddress_by_domain( $domain, $path ){
- if ( is_subdomain_install() ) {
- $url = "http://".$domain.$path;
- } else {
- if ( $domain != $_SERVER['HTTP_HOST'] ) {
- $blogname = substr( $domain, 0, strpos( $domain, '.' ) );
- $url = 'http://' . substr( $domain, strpos( $domain, '.' ) + 1 ) . $path;
- // we're not installing the main blog
- if ( $blogname != 'www.' )
- $url .= $blogname . '/';
- } else { // main blog
- $url = 'http://' . $domain . $path;
- }
- }
- return esc_url( $url );
-}
-
</del><span class="cx"> function get_sitestats() {
</span><span class="cx"> global $wpdb;
</span><span class="cx">
</span><span class="lines">@@ -80,361 +36,6 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-function get_id_from_blogname( $name ) {
- global $wpdb, $current_site;
- $blog_id = wp_cache_get( "get_id_from_blogname_" . $name, 'blog-details' );
- if ( $blog_id )
- return $blog_id;
-
- if ( is_subdomain_install() ) {
- $domain = $name . '.' . $current_site->domain;
- $path = $current_site->path;
- } else {
- $domain = $current_site->domain;
- $path = $current_site->path . $name . '/';
- }
- $blog_id = $wpdb->get_var( $wpdb->prepare("SELECT blog_id FROM {$wpdb->blogs} WHERE domain = %s AND path = %s", $domain, $path) );
- wp_cache_set( 'get_id_from_blogname_' . $name, $blog_id, 'blog-details' );
- return $blog_id;
-}
-
-/**
- * Retrieve the details for a blog from the blogs table and blog options.
- *
- * @since 3.0
- * @param int $blog_id Blog ID
- * @param bool $get_all Whether to retrieve all details or only the details in the blogs table. Default is true.
- * @return object Blog details.
- */
-function get_blog_details( $blog_id, $get_all = true ) {
- global $wpdb;
-
- if ( !is_numeric( $blog_id ) )
- $blog_id = get_id_from_blogname( $blog_id );
-
- $blog_id = (int) $blog_id;
-
- $all = $get_all == true ? '' : 'short';
- $details = wp_cache_get( $blog_id . $all, 'blog-details' );
-
- if ( $details ) {
- if ( ! is_object( $details ) ) {
- if ( $details == -1 )
- return false;
- else
- // Clear old pre-serialized objects. Cache clients do better with that.
- wp_cache_delete( $blog_id . $all, 'blog-details' );
- }
- return $details;
- }
-
- $details = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->blogs WHERE blog_id = %d", $blog_id ) );
- if ( ! $details ) {
- wp_cache_set( $blog_id . $all, -1, 'blog-details' );
- return false;
- }
-
- if ( ! $get_all ) {
- wp_cache_set( $blog_id . $all, $details, 'blog-details' );
- return $details;
- }
-
- $details->blogname = get_blog_option( $blog_id, 'blogname' );
- $details->siteurl = get_blog_option( $blog_id, 'siteurl' );
- $details->post_count = get_blog_option( $blog_id, 'post_count' );
-
- $details = apply_filters( 'blog_details', $details );
-
- wp_cache_set( $blog_id . $all, $details, 'blog-details' );
-
- $key = md5( $details->domain . $details->path );
- wp_cache_set( $key, $details, 'blog-lookup' );
-
- return $details;
-}
-
-/**
- * Clear the blog details cache.
- *
- * @since 3.0
- *
- * @param int $blog_id Blog ID
- */
-function refresh_blog_details( $blog_id ) {
- $blog_id = (int) $blog_id;
- $details = get_blog_details( $blog_id, false );
-
- wp_cache_delete( $blog_id , 'blog-details' );
- wp_cache_delete( $blog_id . 'short' , 'blog-details' );
- wp_cache_delete( md5( $details->domain . $details->path ) , 'blog-lookup' );
- wp_cache_delete( 'current_blog_' . $details->domain, 'site-options' );
- wp_cache_delete( 'current_blog_' . $details->domain . $details->path, 'site-options' );
-}
-
-/**
- * Update the details for a blog. Updates the blogs table for a given blog id.
- *
- * @since 3.0
- *
- * @param int $blog_id Blog ID
- * @param array $details Array of details keyed by blogs table field names.
- * @return bool True if update succeeds, false otherwise.
- */
-function update_blog_details( $blog_id, $details = array() ) {
- global $wpdb;
-
- if ( empty($details) )
- return false;
-
- if ( is_object($details) )
- $details = get_object_vars($details);
-
- $current_details = get_blog_details($blog_id, false);
- if ( empty($current_details) )
- return false;
-
- $current_details = get_object_vars($current_details);
-
- $details = array_merge($current_details, $details);
- $details['last_updated'] = current_time('mysql', true);
-
- $update_details = array();
- $fields = array( 'site_id', 'domain', 'path', 'registered', 'last_updated', 'public', 'archived', 'mature', 'spam', 'deleted', 'lang_id');
- foreach ( array_intersect( array_keys( $details ), $fields ) as $field )
- $update_details[$field] = $details[$field];
-
- $result = $wpdb->update( $wpdb->blogs, $update_details, array('blog_id' => $blog_id) );
-
- // If spam status changed, issue actions.
- if ( $details[ 'spam' ] != $current_details[ 'spam' ] ) {
- if ( $details[ 'spam' ] == 1 )
- do_action( "make_spam_blog", $blog_id );
- else
- do_action( "make_ham_blog", $blog_id );
- }
-
- if ( isset($details[ 'public' ]) )
- update_blog_option( $blog_id, 'blog_public', $details[ 'public' ], false );
-
- refresh_blog_details($blog_id);
-
- return true;
-}
-
-/**
- * Retrieve option value based on setting name and blog_id.
- *
- * If the option does not exist or does not have a value, then the return value
- * will be false. This is useful to check whether you need to install an option
- * and is commonly used during installation of plugin options and to test
- * whether upgrading is required.
- *
- * There is a filter called 'blog_option_$option' with the $option being
- * replaced with the option name. The filter takes two parameters. $value and
- * $blog_id. It returns $value.
- * The 'option_$option' filter in get_option() is not called.
- *
- * @since NA
- * @package WordPress MU
- * @subpackage Option
- * @uses apply_filters() Calls 'blog_option_$optionname' with the option name value.
- *
- * @param int $blog_id is the id of the blog.
- * @param string $setting Name of option to retrieve. Should already be SQL-escaped
- * @param string $default (optional) Default value returned if option not found.
- * @return mixed Value set for the option.
- */
-function get_blog_option( $blog_id, $setting, $default = false ) {
- global $wpdb;
-
- $key = $blog_id."-".$setting."-blog_option";
- $value = wp_cache_get( $key, "site-options" );
- if ( $value == null ) {
- if ( $blog_id == $wpdb->blogid ) {
- $value = get_option( $setting, $default );
- $notoptions = wp_cache_get( 'notoptions', 'options' );
- if ( isset( $notoptions[$setting] ) )
- wp_cache_set( $key, 'noop', 'site-options' );
- elseif ( $value == false )
- wp_cache_set( $key, 'falsevalue', 'site-options' );
- else
- wp_cache_set( $key, $value, 'site-options' );
- } else {
- $blog_prefix = $wpdb->get_blog_prefix( $blog_id );
- $row = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$blog_prefix}options WHERE option_name = %s", $setting ) );
- if ( is_object( $row ) ) { // Has to be get_row instead of get_var because of funkiness with 0, false, null values
- $value = $row->option_value;
- if ( $value == false )
- wp_cache_set( $key, 'falsevalue', 'site-options' );
- else
- wp_cache_set( $key, $value, 'site-options' );
- } else { // option does not exist, so we must cache its non-existence
- wp_cache_set( $key, 'noop', 'site-options' );
- $value = $default;
- }
- }
- } elseif ( $value == 'noop' ) {
- $value = $default;
- } elseif ( $value == 'falsevalue' ) {
- $value = false;
- }
- // If home is not set use siteurl.
- if ( 'home' == $setting && '' == $value )
- return get_blog_option( $blog_id, 'siteurl' );
-
- if ( 'siteurl' == $setting || 'home' == $setting || 'category_base' == $setting )
- $value = untrailingslashit( $value );
-
- if (! @unserialize( $value ) )
- $value = stripslashes( $value );
-
- return apply_filters( 'blog_option_' . $setting, maybe_unserialize( $value ), $blog_id );
-}
-
-function add_blog_option( $id, $key, $value ) {
- $id = (int) $id;
-
- switch_to_blog($id);
- add_option( $key, $value );
- restore_current_blog();
- wp_cache_set( $id."-".$key."-blog_option", $value, 'site-options' );
-}
-
-function delete_blog_option( $id, $key ) {
- $id = (int) $id;
-
- switch_to_blog($id);
- delete_option( $key );
- restore_current_blog();
- wp_cache_set( $id."-".$key."-blog_option", '', 'site-options' );
-}
-
-function update_blog_option( $id, $key, $value, $refresh = true ) {
- $id = (int) $id;
-
- switch_to_blog($id);
- update_option( $key, $value );
- restore_current_blog();
-
- if ( $refresh == true )
- refresh_blog_details( $id );
- wp_cache_set( $id."-".$key."-blog_option", $value, 'site-options');
-}
-
-function switch_to_blog( $new_blog, $validate = false ) {
- global $wpdb, $table_prefix, $blog_id, $switched, $switched_stack, $wp_roles, $current_user, $wp_object_cache;
-
- if ( empty($new_blog) )
- $new_blog = $blog_id;
-
- if ( $validate && ! get_blog_details( $new_blog ) )
- return false;
-
- if ( empty($switched_stack) )
- $switched_stack = array();
-
- $switched_stack[] = $blog_id;
-
- /* If we're switching to the same blog id that we're on,
- * set the right vars, do the associated actions, but skip
- * the extra unnecessary work */
- if ( $blog_id == $new_blog ) {
- do_action( 'switch_blog', $blog_id, $blog_id );
- $switched = true;
- return true;
- }
-
- $wpdb->set_blog_id($new_blog);
- $table_prefix = $wpdb->prefix;
- $prev_blog_id = $blog_id;
- $blog_id = $new_blog;
-
- if ( is_object( $wp_roles ) ) {
- $wpdb->suppress_errors();
- if ( method_exists( $wp_roles ,'_init' ) )
- $wp_roles->_init();
- elseif ( method_exists( $wp_roles, '__construct' ) )
- $wp_roles->__construct();
- $wpdb->suppress_errors( false );
- }
-
- if ( is_object( $current_user ) )
- $current_user->for_blog( $blog_id );
-
- if ( is_object( $wp_object_cache ) && isset( $wp_object_cache->global_groups ) )
- $global_groups = $wp_object_cache->global_groups;
- else
- $global_groups = false;
-
- wp_cache_init();
- if ( function_exists('wp_cache_add_global_groups') ) {
- if ( is_array( $global_groups ) )
- wp_cache_add_global_groups( $global_groups );
- else
- wp_cache_add_global_groups( array( 'users', 'userlogins', 'usermeta', 'site-options', 'site-lookup', 'blog-lookup', 'blog-details', 'rss', 'site-transient', 'global-posts' ) );
- wp_cache_add_non_persistent_groups(array( 'comment', 'counts', 'plugins' ));
- }
-
- do_action('switch_blog', $blog_id, $prev_blog_id);
- $switched = true;
- return true;
-}
-
-function restore_current_blog() {
- global $table_prefix, $wpdb, $blog_id, $switched, $switched_stack, $wp_roles, $current_user, $wp_object_cache;
-
- if ( !$switched )
- return false;
-
- if ( !is_array( $switched_stack ) )
- return false;
-
- $blog = array_pop( $switched_stack );
- if ( $blog_id == $blog ) {
- do_action( 'switch_blog', $blog, $blog );
- /* If we still have items in the switched stack, consider ourselves still 'switched' */
- $switched = ( is_array( $switched_stack ) && count( $switched_stack ) > 0 );
- return true;
- }
-
- $wpdb->set_blog_id($blog);
- $prev_blog_id = $blog_id;
- $blog_id = $blog;
- $table_prefix = $wpdb->prefix;
-
- if ( is_object( $wp_roles ) ) {
- $wpdb->suppress_errors();
- if ( method_exists( $wp_roles ,'_init' ) )
- $wp_roles->_init();
- elseif ( method_exists( $wp_roles, '__construct' ) )
- $wp_roles->__construct();
- $wpdb->suppress_errors( false );
- }
-
- if ( is_object( $current_user ) )
- $current_user->for_blog( $blog_id );
-
- if ( is_object( $wp_object_cache ) && isset( $wp_object_cache->global_groups ) )
- $global_groups = $wp_object_cache->global_groups;
- else
- $global_groups = false;
-
- wp_cache_init();
- if ( function_exists('wp_cache_add_global_groups') ) {
- if ( is_array( $global_groups ) )
- wp_cache_add_global_groups( $global_groups );
- else
- wp_cache_add_global_groups( array( 'users', 'userlogins', 'usermeta', 'site-options', 'site-lookup', 'blog-lookup', 'blog-details', 'rss', 'site-transient' ) );
- wp_cache_add_non_persistent_groups(array( 'comment', 'counts', 'plugins' ));
- }
-
- do_action('switch_blog', $blog_id, $prev_blog_id);
-
- /* If we still have items in the switched stack, consider ourselves still 'switched' */
- $switched = ( is_array( $switched_stack ) && count( $switched_stack ) > 0 );
- return true;
-}
-
</del><span class="cx"> function get_blogs_of_user( $id, $all = false ) {
</span><span class="cx"> global $wpdb;
</span><span class="cx">
</span><span class="lines">@@ -550,61 +151,6 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-function is_archived( $id ) {
- return get_blog_status($id, 'archived');
-}
-
-function update_archived( $id, $archived ) {
- update_blog_status($id, 'archived', $archived);
- return $archived;
-}
-
-/**
- * Update a blog details field.
- *
- * @since 3.0
- *
- * @param int $blog_id BLog ID
- * @param string $pref A field name
- * @param string $value Value for $pref
- * @param bool $refresh Whether to refresh the blog details cache. Default is true.
- */
-function update_blog_status( $blog_id, $pref, $value, $refresh = true ) {
- global $wpdb;
-
- if ( !in_array( $pref, array( 'site_id', 'domain', 'path', 'registered', 'last_updated', 'public', 'archived', 'mature', 'spam', 'deleted', 'lang_id') ) )
- return $value;
-
- $wpdb->update( $wpdb->blogs, array($pref => $value, 'last_updated' => current_time('mysql', true)), array('blog_id' => $blog_id) );
-
- if ( $refresh )
- refresh_blog_details($blog_id);
-
- if ( $pref == 'spam' ) {
- if ( $value == 1 )
- do_action( "make_spam_blog", $blog_id );
- else
- do_action( "make_ham_blog", $blog_id );
- }
-
- return $value;
-}
-
-function get_blog_status( $id, $pref ) {
- global $wpdb;
-
- $details = get_blog_details( $id, false );
- if ( $details )
- return $details->$pref;
-
- return $wpdb->get_var( $wpdb->prepare("SELECT %s FROM {$wpdb->blogs} WHERE blog_id = %d", $pref, $id) );
-}
-
-function get_last_updated( $deprecated = '', $start = 0, $quantity = 40 ) {
- global $wpdb;
- return $wpdb->get_results( $wpdb->prepare("SELECT blog_id, domain, path FROM $wpdb->blogs WHERE site_id = %d AND public = '1' AND archived = '0' AND mature = '0' AND spam = '0' AND deleted = '0' AND last_updated != '0000-00-00 00:00:00' ORDER BY last_updated DESC limit %d, %d", $wpdb->siteid, $start, $quantity ) , ARRAY_A );
-}
-
</del><span class="cx"> function get_most_active_blogs( $num = 10, $display = true ) {
</span><span class="cx"> $most_active = get_site_option( "most_active" );
</span><span class="cx"> $update = false;
</span><span class="lines">@@ -648,41 +194,6 @@
</span><span class="cx"> return array_slice( $most_active, 0, $num );
</span><span class="cx"> }
</span><span class="cx">
</span><del>-function get_blog_list( $start = 0, $num = 10, $deprecated = '' ) {
- global $wpdb;
-
- $blogs = get_site_option( "blog_list" );
- $update = false;
- if ( is_array( $blogs ) ) {
- if ( ( $blogs['time'] + 60 ) < time() ) { // cache for 60 seconds.
- $update = true;
- }
- } else {
- $update = true;
- }
-
- if ( $update == true ) {
- unset( $blogs );
- $blogs = $wpdb->get_results( $wpdb->prepare("SELECT blog_id, domain, path FROM $wpdb->blogs WHERE site_id = %d AND public = '1' AND archived = '0' AND mature = '0' AND spam = '0' AND deleted = '0' ORDER BY registered DESC", $wpdb->siteid), ARRAY_A );
-
- foreach ( (array) $blogs as $details ) {
- $blog_list[ $details['blog_id'] ] = $details;
- $blog_list[ $details['blog_id'] ]['postcount'] = $wpdb->get_var( "SELECT COUNT(ID) FROM " . $wpdb->base_prefix . $details['blog_id'] . "_posts WHERE post_status='publish' AND post_type='post'" );
- }
- unset( $blogs );
- $blogs = $blog_list;
- update_site_option( "blog_list", $blogs );
- }
-
- if ( false == is_array( $blogs ) )
- return array();
-
- if ( $num == 'all' )
- return array_slice( $blogs, $start, count( $blogs ) );
- else
- return array_slice( $blogs, $start, $num );
-}
-
</del><span class="cx"> function get_user_count() {
</span><span class="cx"> global $wpdb;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpsettingsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-settings.php (13124 => 13125)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-settings.php 2010-02-13 20:40:42 UTC (rev 13124)
+++ trunk/wp-settings.php 2010-02-13 22:35:11 UTC (rev 13125)
</span><span class="lines">@@ -74,8 +74,10 @@
</span><span class="cx"> wp_start_object_cache();
</span><span class="cx">
</span><span class="cx"> // Initialize multisite if enabled.
</span><del>-if ( is_multisite() )
</del><ins>+if ( is_multisite() ) {
+ require( ABSPATH . WPINC . '/blogs.php' );
</ins><span class="cx"> require( ABSPATH . WPINC . '/ms-settings.php' );
</span><ins>+}
</ins><span class="cx">
</span><span class="cx"> // Load early WordPress files.
</span><span class="cx"> require( ABSPATH . WPINC . '/plugin.php' );
</span></span></pre>
</div>
</div>
</body>
</html>