vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-06-28 14:20:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Multisite: Use get_network() and get_current_network_id() for current network data.

Browse Source 
`get_network()` falls back to the current network when called without any arguments. Between this and `get_current_network_id()`, we can replace almost all instances of the global `$current_site` and all instances of `get_current_site()`.

This effectively deprecates `get_current_site()`, something that we'll do in a future ticket.

Props flixos90.
Fixes #37414.


git-svn-id: https://develop.svn.wordpress.org/trunk@38814 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Jeremy Felt
2016-10-19 04:46:14 +00:00
parent 8a79cdc107
commit 2979167ba7
25 changed files with 101 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/wp-includes/option.php
View File

@@ -1069,8 +1069,7 @@ function update_site_option( $option, $value ) {
*
* @see get_option()
*
* @global wpdb $wpdb
* @global object $current_site
* @global wpdb $wpdb
*
* @param int $network_id ID of the network. Can be null to default to the current network ID.
* @param string $option Name of option to retrieve. Expected to not be SQL-escaped.
@@ -1078,7 +1077,7 @@ function update_site_option( $option, $value ) {
* @return mixed Value set for the option.
*/
function get_network_option( $network_id, $option, $default = false ) {
global $wpdb, $current_site;
global $wpdb;
if ( $network_id && ! is_numeric( $network_id ) ) {
return false;
@@ -1087,8 +1086,8 @@ function get_network_option( $network_id, $option, $default = false ) {
$network_id = (int) $network_id;
// Fallback to the current network if a network ID is not specified.
if ( ! $network_id && is_multisite() ) {
$network_id = $current_site->id;
if ( ! $network_id ) {
$network_id = get_current_network_id();
}
/**
@@ -1186,8 +1185,7 @@ function get_network_option( $network_id, $option, $default = false ) {
*
* @see add_option()
*
* @global wpdb $wpdb
* @global object $current_site
* @global wpdb $wpdb
*
* @param int $network_id ID of the network. Can be null to default to the current network ID.
* @param string $option Name of option to add. Expected to not be SQL-escaped.
@@ -1195,7 +1193,7 @@ function get_network_option( $network_id, $option, $default = false ) {
* @return bool False if option was not added and true if option was added.
*/
function add_network_option( $network_id, $option, $value ) {
global $wpdb, $current_site;
global $wpdb;
if ( $network_id && ! is_numeric( $network_id ) ) {
return false;
@@ -1204,8 +1202,8 @@ function add_network_option( $network_id, $option, $value ) {
$network_id = (int) $network_id;
// Fallback to the current network if a network ID is not specified.
if ( ! $network_id && is_multisite() ) {
$network_id = $current_site->id;
if ( ! $network_id ) {
$network_id = get_current_network_id();
}
wp_protect_special_option( $option );
@@ -1296,15 +1294,14 @@ function add_network_option( $network_id, $option, $value ) {
*
* @see delete_option()
*
* @global wpdb $wpdb
* @global object $current_site
* @global wpdb $wpdb
*
* @param int $network_id ID of the network. Can be null to default to the current network ID.
* @param string $option Name of option to remove. Expected to not be SQL-escaped.
* @return bool True, if succeed. False, if failure.
*/
function delete_network_option( $network_id, $option ) {
global $wpdb, $current_site;
global $wpdb;
if ( $network_id && ! is_numeric( $network_id ) ) {
return false;
@@ -1313,8 +1310,8 @@ function delete_network_option( $network_id, $option ) {
$network_id = (int) $network_id;
// Fallback to the current network if a network ID is not specified.
if ( ! $network_id && is_multisite() ) {
$network_id = $current_site->id;
if ( ! $network_id ) {
$network_id = get_current_network_id();
}
/**
@@ -1378,8 +1375,7 @@ function delete_network_option( $network_id, $option ) {
*
* @see update_option()
*
* @global wpdb $wpdb
* @global object $current_site
* @global wpdb $wpdb
*
* @param int $network_id ID of the network. Can be null to default to the current network ID.
* @param string $option Name of option. Expected to not be SQL-escaped.
@@ -1387,7 +1383,7 @@ function delete_network_option( $network_id, $option ) {
* @return bool False if value was not updated and true if value was updated.
*/
function update_network_option( $network_id, $option, $value ) {
global $wpdb, $current_site;
global $wpdb;
if ( $network_id && ! is_numeric( $network_id ) ) {
return false;
@@ -1396,8 +1392,8 @@ function update_network_option( $network_id, $option, $value ) {
$network_id = (int) $network_id;
// Fallback to the current network if a network ID is not specified.
if ( ! $network_id && is_multisite() ) {
$network_id = $current_site->id;
if ( ! $network_id ) {
$network_id = get_current_network_id();
}
wp_protect_special_option( $option );