vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-07-03 08:40:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Multisite: Rename internal $site_id variables referencing networks to $network_id.

Browse Source 
This change improves code clarity by using the current naming conventions for networks.

Props lemacarl.
Fixes #41510.


git-svn-id: https://develop.svn.wordpress.org/trunk@41241 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Felix Arntz
2017-08-12 12:47:38 +00:00
parent 0979d6ebfb
commit 9595e6c38b
5 changed files with 69 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/wp-includes/ms-deprecated.php
View File

@@ -420,22 +420,22 @@ function create_empty_blog( $domain, $path, $weblog_title, $site_id = 1 ) {
*
* @global wpdb $wpdb WordPress database abstraction object.
*
* @param string $sitedomain Optional. Site domain.
* @param string $path Optional. Site path.
* @return array|false The network admins
* @param string $domain Optional. Network domain.
* @param string $path Optional. Network path.
* @return array|false The network admins.
*/
function get_admin_users_for_domain( $sitedomain = '', $path = '' ) {
function get_admin_users_for_domain( $domain = '', $path = '' ) {
_deprecated_function( __FUNCTION__, '4.4.0' );
global $wpdb;
if ( ! $sitedomain )
$site_id = $wpdb->siteid;
if ( ! $domain )
$network_id = $wpdb->siteid;
else
$site_id = $wpdb->get_var( $wpdb->prepare( "SELECT id FROM $wpdb->site WHERE domain = %s AND path = %s", $sitedomain, $path ) );
$network_id = $wpdb->get_var( $wpdb->prepare( "SELECT id FROM $wpdb->site WHERE domain = %s AND path = %s", $domain, $path ) );
if ( $site_id )
return $wpdb->get_results( $wpdb->prepare( "SELECT u.ID, u.user_login, u.user_pass FROM $wpdb->users AS u, $wpdb->sitemeta AS sm WHERE sm.meta_key = 'admin_user_id' AND u.ID = sm.meta_value AND sm.site_id = %d", $site_id ), ARRAY_A );
if ( $network_id )
return $wpdb->get_results( $wpdb->prepare( "SELECT u.ID, u.user_login, u.user_pass FROM $wpdb->users AS u, $wpdb->sitemeta AS sm WHERE sm.meta_key = 'admin_user_id' AND u.ID = sm.meta_value AND sm.site_id = %d", $network_id ), ARRAY_A );
return false;
}