Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-12-23 01:27:36 +01:00
Code Issues Projects Releases Wiki Activity

Single quotes and spaces in ms-blogs.php. props niallkennedy, fixes #17522.

Browse Source 
git-svn-id: http://svn.automattic.com/wordpress/trunk@17988 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
nacin 2011-05-22 22:19:36 +00:00
parent 97e8bd742d
commit d96d3a74b8
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
wp-includes/ms-blogs.php
View File

@ -71,7 +71,7 @@ function get_blogaddress_by_name( $blogname ) {
*/
function get_blogaddress_by_domain( $domain, $path ) {
if ( is_subdomain_install() ) {
$url = "http://".$domain.$path;
$url = "http://" . $domain.$path;
} else {
if ( $domain != $_SERVER['HTTP_HOST'] ) {
$blogname = substr( $domain, 0, strpos( $domain, '.' ) );
@ -96,7 +96,7 @@ function get_blogaddress_by_domain( $domain, $path ) {
*/
function get_id_from_blogname( $name ) {
global $wpdb, $current_site;
$blog_id = wp_cache_get( "get_id_from_blogname_" . $name, 'blog-details' );
$blog_id = wp_cache_get( 'get_id_from_blogname_' . $name, 'blog-details' );
if ( $blog_id )
return $blog_id;
@ -331,8 +331,8 @@ function update_blog_details( $blog_id, $details = array() ) {
function get_blog_option( $blog_id, $setting, $default = false ) {
global $wpdb;
$key = $blog_id."-".$setting."-blog_option";
$value = wp_cache_get( $key, "site-options" );
$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 );
@ -390,7 +390,7 @@ function add_blog_option( $id, $key, $value ) {
switch_to_blog($id);
add_option( $key, $value );
restore_current_blog();
wp_cache_set( $id."-".$key."-blog_option", $value, 'site-options' );
wp_cache_set( $id . '-' . $key . '-blog_option', $value, 'site-options' );
}
/**
@ -407,7 +407,7 @@ function delete_blog_option( $id, $key ) {
switch_to_blog($id);
delete_option( $key );
restore_current_blog();
wp_cache_set( $id."-".$key."-blog_option", '', 'site-options' );
wp_cache_set( $id . '-' . $key . '-blog_option', '', 'site-options' );
}
/**
@ -431,7 +431,7 @@ function update_blog_option( $id, $key, $value, $deprecated = null ) {
refresh_blog_details( $id );
wp_cache_set( $id."-".$key."-blog_option", $value, 'site-options');
wp_cache_set( $id . '-' . $key . '-blog_option', $value, 'site-options');
}
/**