From bceb10680bad126eb95bc893b6910dd152d09c6a Mon Sep 17 00:00:00 2001 From: Andrew Nacin Date: Wed, 5 Mar 2014 06:38:23 +0000 Subject: [PATCH] Deprecate get_current_site_name(). see #27003. git-svn-id: https://develop.svn.wordpress.org/trunk@27407 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/ms-load.php | 41 ++++++++++++++++--------------------- 1 file changed, 18 insertions(+), 23 deletions(-) diff --git a/src/wp-includes/ms-load.php b/src/wp-includes/ms-load.php index 865e39f62d..e7b64b79ca 100644 --- a/src/wp-includes/ms-load.php +++ b/src/wp-includes/ms-load.php @@ -112,29 +112,6 @@ function ms_site_check() { return true; } -/** - * Sets current site name. - * - * @todo deprecate - * - * @access private - * @since 3.0.0 - * @return object $current_site object with site_name - */ -function get_current_site_name( $current_site ) { - global $wpdb; - - $current_site->site_name = wp_cache_get( $current_site->id . ':site_name', 'site-options' ); - if ( ! $current_site->site_name ) { - $current_site->site_name = $wpdb->get_var( $wpdb->prepare( "SELECT meta_value FROM $wpdb->sitemeta WHERE site_id = %d AND meta_key = 'site_name'", $current_site->id ) ); - if ( ! $current_site->site_name ) - $current_site->site_name = ucfirst( $current_site->domain ); - wp_cache_set( $current_site->id . ':site_name', $current_site->site_name, 'site-options' ); - } - - return $current_site; -} - /** * Retrieve a network object by its domain and path. * @@ -422,3 +399,21 @@ function ms_not_installed() { wp_die( $msg, $title ); } + +/** + * This deprecated function formerly set the site_name property of the $current_site object. + * + * This function simply returns the object, as before. + * The bootstrap takes care of setting site_name. + * + * @access private + * @since 3.0.0 + * @deprecated 3.9.0 + * + * @param object $current_site + * @return object + */ +function get_current_site_name( $current_site ) { + _deprecated_function( __FUNCTION__, '3.9' ); + return $current_site; +}