WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Props flixos90.
Fixes #38320.

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


git-svn-id: http://core.svn.wordpress.org/trunk@38759 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Jeremy Felt 2016-10-19 04:56:28 +00:00
parent df6675d1ec
commit 213a0a2477
2 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
wp-includes/option.php
View File

@ -1221,12 +1221,14 @@ function add_network_option( $network_id, $option, $value ) {
* *
* @since 2.9.0 As 'pre_add_site_option_' . $key * @since 2.9.0 As 'pre_add_site_option_' . $key
* @since 3.0.0 * @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 Value of network option. * @param mixed $value Value of network option.
* @param string $option Option name. * @param string $option Option name.
* @param int $network_id ID of the network.
*/ */
$value = apply_filters( "pre_add_site_option_{$option}", $value, $option ); $value = apply_filters( "pre_add_site_option_{$option}", $value, $option, $network_id );
$notoptions_key = "$network_id:notoptions"; $notoptions_key = "$network_id:notoptions";
@ -1271,21 +1273,25 @@ function add_network_option( $network_id, $option, $value ) {
* *
* @since 2.9.0 As "add_site_option_{$key}" * @since 2.9.0 As "add_site_option_{$key}"
* @since 3.0.0 * @since 3.0.0
* @since 4.7.0 The `$network_id` parameter was added.
* *
* @param string $option Name of the network option. * @param string $option Name of the network option.
* @param mixed $value Value of the network option. * @param mixed $value Value of the network option.
* @param int $network_id ID of the network.
*/ */
do_action( "add_site_option_{$option}", $option, $value ); do_action( "add_site_option_{$option}", $option, $value, $network_id );
/** /**
* Fires after a network option has been successfully added. * Fires after a network option has been successfully added.
* *
* @since 3.0.0 * @since 3.0.0
* @since 4.7.0 The `$network_id` parameter was added.
* *
* @param string $option Name of the network option. * @param string $option Name of the network option.
* @param mixed $value Value of the network option. * @param mixed $value Value of the network option.
* @param int $network_id ID of the network.
*/ */
do_action( 'add_site_option', $option, $value ); do_action( 'add_site_option', $option, $value, $network_id );
return true; return true;
} }

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.7-alpha-38815'; $wp_version = '4.7-alpha-38816';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.