Changeset 29668

Timestamp:

09/02/2014 07:29:47 AM (10 years ago)

Author:

SergeyBiryukov

Message:

Simplify the code for calling refresh_blog_details() whenever 'blogname', 'siteurl', or 'post_count' option is updated.

props pento, nacin.
fixes #26410.

Location:

trunk/src/wp-includes

Files:

• ms-blogs.php (modified) (2 diffs)
• ms-default-filters.php (modified) (1 diff)

trunk/src/wp-includes/ms-blogs.php

@@ -236 +236 @@
  * @since MU
  *
- * @param int $blog_id Blog ID
- */
-function refresh_blog_details( $blog_id ) {
+ * @param int $blog_id Optional. Blog ID. Defaults to current blog.
+ */
+function refresh_blog_details( $blog_id = 0 ) {
     $blog_id = (int) $blog_id;
+    if ( ! $blog_id ) {
+        $blog_id = get_current_blog_id();
+    }
+
     $details = get_blog_details( $blog_id, false );
     if ( ! $details ) {
@@ -262 +266 @@
      */
     do_action( 'refresh_blog_details', $blog_id );
-}
-
-/**
- * Refresh blog details when an option is updated.
- *
- * @access private
- * @param string $option_name
- */
-function _wp_refresh_blog_details_on_updated_option( $option_name ) {
-    $options = array( 'blogname', 'siteurl', 'post_count' );
-    if ( in_array( $option_name, $options ) ) {
-        refresh_blog_details( get_current_blog_id() );
-    }
 }
 

trunk/src/wp-includes/ms-default-filters.php

@@ -72 +72 @@
 
 // Some options changes should trigger blog details refresh.
-add_action( 'updated_option', '_wp_refresh_blog_details_on_updated_option' );
+add_action( 'update_option_blogname',   'refresh_blog_details', 10, 0 );
+add_action( 'update_option_siteurl',    'refresh_blog_details', 10, 0 );
+add_action( 'update_option_post_count', 'refresh_blog_details', 10, 0 );
 
 // If the network upgrade hasn't run yet, assume ms-files.php rewriting is used.