vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-08-16 14:50:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Deprecate is_main_blog() for is_main_site(). see #11644

Browse Source 
git-svn-id: https://develop.svn.wordpress.org/trunk@12858 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Ryan Boren
2010-01-26 22:46:09 +00:00
parent b6feb64ea4
commit 909191a37d
4 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wp-includes/ms-functions.php
+1 -8
View File
@@ -81,13 +81,6 @@ function get_admin_users_for_domain( $sitedomain = '', $path = '' ) {
return false;
}
function is_main_blog() {
global $current_blog, $current_site;
if ( $current_blog->domain == $current_site->domain && $current_blog->path == $current_site->path )
return true;
return false;
}
function get_id_from_blogname( $name ) {
global $wpdb, $current_site;
$blog_id = wp_cache_get( "get_id_from_blogname_" . $name, 'blog-details' );
@@ -1819,7 +1812,7 @@ function signup_nonce_check( $result ) {
function maybe_redirect_404() {
global $current_site;
if ( is_main_blog() && is_404() && defined( 'NOBLOGREDIRECT' ) && constant( 'NOBLOGREDIRECT' ) != '' ) {
if ( is_main_site() && is_404() && defined( 'NOBLOGREDIRECT' ) && constant( 'NOBLOGREDIRECT' ) != '' ) {
$destination = constant( 'NOBLOGREDIRECT' );
if ( $destination == '%siteurl%' )
$destination = $current_site->domain . $current_site->path;