From 122862b570bae41883f350fafbb1e8a4dbbdc3a0 Mon Sep 17 00:00:00 2001
From: Jeremy Felt <jeremy.felt@gmail.com>
Date: Sat, 5 Sep 2015 20:39:24 +0000
Subject: [PATCH] Multisite: Pass the ID of the site being updated to
 `wpmu_update_blog_options` action.

Props @swissspidy, @MikeHansenMe.
Fixes #32907.

Built from https://develop.svn.wordpress.org/trunk@33918


git-svn-id: http://core.svn.wordpress.org/trunk@33887 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/network/site-settings.php | 16 ++++++++++------
 wp-includes/version.php            |  2 +-
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/wp-admin/network/site-settings.php b/wp-admin/network/site-settings.php
index ddc0f18ab1..879363e343 100644
--- a/wp-admin/network/site-settings.php
+++ b/wp-admin/network/site-settings.php
@@ -62,12 +62,16 @@ if ( isset($_REQUEST['action']) && 'update-site' == $_REQUEST['action'] && is_ar
 		update_option( $key, $val );
 	}
 
-/**
- * Fires after the site options are updated.
- *
- * @since 3.0.0
- */
-	do_action( 'wpmu_update_blog_options' );
+	/**
+	 * Fires after the site options are updated.
+	 *
+	 * @since 3.0.0
+	 * @since 4.4.0 Added `$id` parameter.
+	 *
+	 * @param int $id The ID of the site being updated.
+	 */
+	do_action( 'wpmu_update_blog_options', $id );
+
 	restore_current_blog();
 	wp_redirect( add_query_arg( array( 'update' => 'updated', 'id' => $id ), 'site-settings.php') );
 	exit;
diff --git a/wp-includes/version.php b/wp-includes/version.php
index f506752ee7..e88fb979f7 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.4-alpha-33917';
+$wp_version = '4.4-alpha-33918';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.