Ticket #27003: 27003.20.diff

src/wp-includes/deprecated.php

@@ -3430 +3430 @@
 function default_topic_count_text( $count ) {
         return $count;
 }
+
+/**
+ * Sets current site name.
+ *
+ * @access private
+ * @since 3.0.0
+ * @deprecated 3.9.0
+ * @return object $current_site object with site_name
+ */
+function get_current_site_name( $current_site ) {
+        _deprecated_function( __FUNCTION__, '3.9', 'wp_get_network()' );
+
+        return wp_get_network( $current_site->id );
+}
+ No newline at end of file

src/wp-includes/ms-load.php

@@ -113 +113 @@
 }
 
 /**
- * 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.
  *
  * @since 3.9.0