Changeset 21414 for trunk/wp-includes/link-template.php

Timestamp:

08/03/2012 05:51:42 PM (12 years ago)

Author:

ryan

Message:

Deprecate get_blog_option(), add_blog_option(), update_blog_option(), and delete_blog_option().

Use the regular option functions wrapped in switch_to_blog() and restore_current_blog() instead.

Group multiple operations within a single switch where possible.

fixes #21432

File:

• trunk/wp-includes/link-template.php (modified) (2 diffs)

trunk/wp-includes/link-template.php

@@ -1897 +1897 @@
         $scheme = is_ssl() && !is_admin() ? 'https' : 'http';
 
-    if ( empty( $blog_id ) || !is_multisite() )
+    if ( empty( $blog_id ) || !is_multisite() ) {
         $url = get_option( 'home' );
-    else
-        $url = get_blog_option( $blog_id, 'home' );
+    } else {
+        switch_to_blog( $blog_id );
+        $url = get_option( 'home' );
+        restore_current_blog();
+    }
 
     if ( 'relative' == $scheme )
@@ -1962 +1965 @@
     }
 
-    if ( empty( $blog_id ) || !is_multisite() )
+    if ( empty( $blog_id ) || !is_multisite() ) {
         $url = get_option( 'siteurl' );
-    else
-        $url = get_blog_option( $blog_id, 'siteurl' );
+    } else {
+        switch_to_blog( $blog_id );
+        $url = get_option( 'siteurl' );
+        restore_current_blog();
+    }
 
     if ( 'relative' == $scheme )