Changeset 38815

Timestamp:

10/19/2016 04:53:02 AM (10 years ago)

Author:

jeremyfelt

Message:

Multisite: Add $network_id parameter to filters in get_network_option().

Props flixos90.
Fixes #38319.

File:

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

trunk/src/wp-includes/option.php

@@ -1101 +1101 @@
          * @since 2.9.0 As 'pre_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  $pre_option The default value to return if the option does not exist.
          * @param string $option     Option name.
-         */
-        $pre = apply_filters( "pre_site_option_{$option}", false, $option );
+         * @param int    $network_id ID of the network.
+         */
+        $pre = apply_filters( "pre_site_option_{$option}", false, $option, $network_id );
 
         if ( false !== $pre ) {
@@ -1125 +1127 @@
                  * @since 3.4.0
                  * @since 4.4.0 The `$option` parameter was added.
-                 *
-                 * @param mixed  $default The value to return if the site option does not exist
-                 *                        in the database.
-                 * @param string $option  Option name.
+                 * @since 4.7.0 The `$network_id` parameter was added.
+                 *
+                 * @param mixed  $default    The value to return if the site option does not exist
+                 *                           in the database.
+                 * @param string $option     Option name.
+                 * @param int    $network_id ID of the network.
                  */
-                return apply_filters( "default_site_option_{$option}", $default, $option );
+                return apply_filters( "default_site_option_{$option}", $default, $option, $network_id );
         }
 
         if ( ! is_multisite() ) {
                 /** This filter is documented in wp-includes/option.php */
-                $default = apply_filters( 'default_site_option_' . $option, $default, $option );
+                $default = apply_filters( 'default_site_option_' . $option, $default, $option, $network_id );
                 $value = get_option( $option, $default );
         } else {
@@ -1157 +1161 @@
 
                                 /** This filter is documented in wp-includes/option.php */
-                                $value = apply_filters( 'default_site_option_' . $option, $default, $option );
+                                $value = apply_filters( 'default_site_option_' . $option, $default, $option, $network_id );
                         }
                 }
@@ -1169 +1173 @@
          * @since 2.9.0 As 'site_option_' . $key
          * @since 3.0.0
-         * @since 4.4.0 The `$option` parameter was added
-         *
-         * @param mixed  $value  Value of network option.
-         * @param string $option Option name.
-         */
-        return apply_filters( "site_option_{$option}", $value, $option );
+         * @since 4.4.0 The `$option` parameter was added.
+         * @since 4.7.0 The `$network_id` parameter was added.
+         *
+         * @param mixed  $value      Value of network option.
+         * @param string $option     Option name.
+         * @param int    $network_id ID of the network.
+         */
+        return apply_filters( "site_option_{$option}", $value, $option, $network_id );
 }