Changeset 34755

Timestamp:

10/01/2015 10:26:19 PM (10 years ago)

Author:

johnbillion

Message:

Deprecate get_admin_users_for_domain(). This function has never been used in core.

Fixes #34122

Location:

trunk/src/wp-includes

Files:

• ms-deprecated.php (modified) (1 diff)
• ms-functions.php (modified) (1 diff)

trunk/src/wp-includes/ms-deprecated.php

@@ -393 +393 @@
     return $blog_id;
 }
+
+/**
+ * Get the admin for a domain/path combination.
+ *
+ * @since MU 1.0
+ * @deprecated 4.4.0
+ *
+ * @global wpdb $wpdb
+ *
+ * @param string $sitedomain Optional. Site domain.
+ * @param string $path       Optional. Site path.
+ * @return array|false The network admins
+ */
+function get_admin_users_for_domain( $sitedomain = '', $path = '' ) {
+    _deprecated_function( __FUNCTION__, '4.4' );
+
+    global $wpdb;
+
+    if ( ! $sitedomain )
+        $site_id = $wpdb->siteid;
+    else
+        $site_id = $wpdb->get_var( $wpdb->prepare( "SELECT id FROM $wpdb->site WHERE domain = %s AND path = %s", $sitedomain, $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 );
+
+    return false;
+}

trunk/src/wp-includes/ms-functions.php

@@ -22 +22 @@
 
     return $stats;
-}
-
-/**
- * Get the admin for a domain/path combination.
- *
- * @since MU 1.0
- *
- * @global wpdb $wpdb
- *
- * @param string $sitedomain Optional. Site domain.
- * @param string $path       Optional. Site path.
- * @return array|false The network admins
- */
-function get_admin_users_for_domain( $sitedomain = '', $path = '' ) {
-    global $wpdb;
-
-    if ( ! $sitedomain )
-        $site_id = $wpdb->siteid;
-    else
-        $site_id = $wpdb->get_var( $wpdb->prepare( "SELECT id FROM $wpdb->site WHERE domain = %s AND path = %s", $sitedomain, $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 );
-
-    return false;
 }