Changeset 12726

Timestamp:

01/15/2010 12:21:13 AM (15 years ago)

Author:

wpmuguru

Message:

merge multisite wp-admin/includes except schema, See #11644

Location:

trunk/wp-admin/includes

Files:

• misc.php (modified) (1 diff)
• template.php (modified) (1 diff)
• update.php (modified) (4 diffs)
• user.php (modified) (5 diffs)

trunk/wp-admin/includes/misc.php

@@ -121 +121 @@
  */
 function save_mod_rewrite_rules() {
+    if ( is_multisite() )
+        return;
+
     global $wp_rewrite;
 

trunk/wp-admin/includes/template.php

@@ -230 +230 @@
                 <span class="input-text-wrap"><input type="text" name="name" class="ptitle" value="" /></span>
             </label>
-
+<?php if ( !is_multisite() ) { ?>
             <label>
                 <span class="title"><?php _e( 'Slug' ); ?></span>
                 <span class="input-text-wrap"><input type="text" name="slug" class="ptitle" value="" /></span>
             </label>
+<?php } ?>
 
 <?php if ( 'category' == $type ) : ?>

trunk/wp-admin/includes/update.php

@@ -83 +83 @@
 
 function core_update_footer( $msg = '' ) {
+    if( is_multisite() && !is_super_admin() )
+        return false;
+
     if ( !current_user_can('manage_options') )
         return sprintf( __( 'Version %s' ), $GLOBALS['wp_version'] );
@@ -116 +119 @@
 
 function update_nag() {
+    if( is_multisite() && !is_super_admin() )
+        return false;
+
     global $pagenow;
 
@@ -137 +143 @@
 // Called directly from dashboard
 function update_right_now_message() {
+    if( is_multisite() && !is_super_admin() )
+        return false;
+
     $cur = get_preferred_from_update_core();
 
@@ -197 +206 @@
 
 function wp_update_plugin($plugin, $feedback = '') {
+    if( is_multisite() && !is_super_admin() )
+        return false;
+
 
     if ( !empty($feedback) )

trunk/wp-admin/includes/user.php

@@ -198 +198 @@
 function get_author_user_ids() {
     global $wpdb;
-    $level_key = $wpdb->prefix . 'user_level';
+    if( !is_multisite() ) {
+        $level_key = $wpdb->get_blog_prefix() . 'user_level';
+    } else {
+        $level_key = $wpdb->get_blog_prefix() . 'capabilities'; // wpmu site admins don't have user_levels
+    }
     return $wpdb->get_col( $wpdb->prepare("SELECT user_id FROM $wpdb->usermeta WHERE meta_key = %s AND meta_value != '0'", $level_key) );
 }
@@ -249 +253 @@
             return array();
     }
-
-    $level_key = $wpdb->prefix . 'user_level';
+    if( !is_multisite() ) {
+        $level_key = $wpdb->get_blog_prefix() . 'user_level';
+    } else {
+        $level_key = $wpdb->get_blog_prefix() . 'capabilities'; // wpmu site admins don't have user_levels
+    }
 
     $query = $wpdb->prepare("SELECT user_id FROM $wpdb->usermeta WHERE meta_key = %s", $level_key);
@@ -295 +302 @@
 function get_nonauthor_user_ids() {
     global $wpdb;
-    $level_key = $wpdb->prefix . 'user_level';
+
+    if ( !is_multisite() ) {
+        $level_key = $wpdb->get_blog_prefix() . 'user_level';
+    } else {
+        $level_key = $wpdb->get_blog_prefix() . 'capabilities'; // wpmu site admins don't have user_levels
+    }
 
     return $wpdb->get_col( $wpdb->prepare("SELECT user_id FROM $wpdb->usermeta WHERE meta_key = %s AND meta_value = '0'", $level_key) );
@@ -441 +453 @@
 
     // FINALLY, delete user
-
-    $wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->usermeta WHERE user_id = %d", $id) );
-    $wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->users WHERE ID = %d", $id) );
+    if ( !is_multisite() ) {
+        $wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->usermeta WHERE user_id = %d", $id) );
+        $wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->users WHERE ID = %d", $id) );
+    } else {
+        $level_key = $wpdb->get_blog_prefix() . 'capabilities'; // wpmu site admins don't have user_levels
+        $wpdb->query("DELETE FROM $wpdb->usermeta WHERE user_id = $id AND meta_key = '{$level_key}'");
+    }
 
     wp_cache_delete($id, 'users');
@@ -662 +678 @@
         if ( $this->role )
             $this->query_from_where .= $wpdb->prepare(" INNER JOIN $wpdb->usermeta ON $wpdb->users.ID = $wpdb->usermeta.user_id WHERE $wpdb->usermeta.meta_key = '{$wpdb->prefix}capabilities' AND $wpdb->usermeta.meta_value LIKE %s", '%' . $this->role . '%');
-        else
+        elseif ( !is_multisite() )
             $this->query_from_where .= " WHERE 1=1";
+        else {
+            $level_key = $wpdb->get_blog_prefix() . 'capabilities'; // wpmu site admins don't have user_levels
+            $this->query_from_where .= ", $wpdb->usermeta WHERE $wpdb->users.ID = $wpdb->usermeta.user_id AND meta_key = '{$level_key}'";
+        }
         $this->query_from_where .= " $search_sql";