From fec49f1fc65474ee4092b11b1d9470603bd5a019 Mon Sep 17 00:00:00 2001
From: Jeremy Felt <jeremyfelt@git.wordpress.org>
Date: Wed, 19 Oct 2016 04:59:20 +0000
Subject: [PATCH] Multisite: Add `$network_id` parameter to hooks in
 `update_network_option()`.

Props flixos90.
Fixes #38321.


git-svn-id: https://develop.svn.wordpress.org/trunk@38817 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/option.php | 32 +++++++++++++++++++-------------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/src/wp-includes/option.php b/src/wp-includes/option.php
index 2903da6b92..35a1594dd3 100644
--- a/src/wp-includes/option.php
+++ b/src/wp-includes/option.php
@@ -1419,13 +1419,15 @@ function update_network_option( $network_id, $option, $value ) {
 	 *
 	 * @since 2.9.0 As 'pre_update_site_option_' . $key
 	 * @since 3.0.0
-	 * @since 4.4.0 The `$option` parameter was added
+	 * @since 4.4.0 The `$option` parameter was added.
+	 * @since 4.7.0 The `$network_id` parameter was added.
 	 *
-	 * @param mixed  $value     New value of the network option.
-	 * @param mixed  $old_value Old value of the network option.
-	 * @param string $option    Option name.
+	 * @param mixed  $value      New value of the network option.
+	 * @param mixed  $old_value  Old value of the network option.
+	 * @param string $option     Option name.
+	 * @param int    $network_id ID of the network.
 	 */
-	$value = apply_filters( "pre_update_site_option_{$option}", $value, $old_value, $option );
+	$value = apply_filters( "pre_update_site_option_{$option}", $value, $old_value, $option, $network_id );
 
 	if ( $value === $old_value ) {
 		return false;
@@ -1465,23 +1467,27 @@ function update_network_option( $network_id, $option, $value ) {
 		 *
 		 * @since 2.9.0 As "update_site_option_{$key}"
 		 * @since 3.0.0
+		 * @since 4.7.0 The `$network_id` parameter was added.
 		 *
-		 * @param string $option    Name of the network option.
-		 * @param mixed  $value     Current value of the network option.
-		 * @param mixed  $old_value Old value of the network option.
+		 * @param string $option     Name of the network option.
+		 * @param mixed  $value      Current value of the network option.
+		 * @param mixed  $old_value  Old value of the network option.
+		 * @param int    $network_id ID of the network.
 		 */
-		do_action( "update_site_option_{$option}", $option, $value, $old_value );
+		do_action( "update_site_option_{$option}", $option, $value, $old_value, $network_id );
 
 		/**
 		 * Fires after the value of a network option has been successfully updated.
 		 *
 		 * @since 3.0.0
+		 * @since 4.7.0 The `$network_id` parameter was added.
 		 *
-		 * @param string $option    Name of the network option.
-		 * @param mixed  $value     Current value of the network option.
-		 * @param mixed  $old_value Old value of the network option.
+		 * @param string $option     Name of the network option.
+		 * @param mixed  $value      Current value of the network option.
+		 * @param mixed  $old_value  Old value of the network option.
+		 * @param int    $network_id ID of the network.
 		 */
-		do_action( 'update_site_option', $option, $value, $old_value );
+		do_action( 'update_site_option', $option, $value, $old_value, $network_id );
 
 		return true;
 	}