Changeset 38817

Timestamp:

10/19/2016 04:59:20 AM (8 years ago)

Author:

jeremyfelt

Message:

Multisite: Add $network_id parameter to hooks in update_network_option().

Props flixos90.
Fixes #38321.

File:

• trunk/src/wp-includes/option.php (modified) (3 diffs)

trunk/src/wp-includes/option.php

@@ -1420 +1420 @@
      * @since 2.9.0 As 'pre_update_site_option_' . $key
      * @since 3.0.0
-     * @since 4.4.0 The `$option` 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.
-     */
-    $value = apply_filters( "pre_update_site_option_{$option}", $value, $old_value, $option );
+     * @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 int    $network_id ID of the network.
+     */
+    $value = apply_filters( "pre_update_site_option_{$option}", $value, $old_value, $option, $network_id );
 
     if ( $value === $old_value ) {
@@ -1466 +1468 @@
          * @since 2.9.0 As "update_site_option_{$key}"
          * @since 3.0.0
-         *
-         * @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.
+         * @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 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 );
 
         /**
@@ -1477 +1481 @@
          *
          * @since 3.0.0
-         *
-         * @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.
+         * @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 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;