@@ -170,7 +170,7 @@ function theme_update_available( $theme ) {
/* translators: 1: theme title, 2: theme version, 3: theme author */
printf(__('%1$s %2$s by %3$s'), $ct->title, $ct->version, $ct->author) ; ?>
description; ?>
-parent_theme ) { ?>
+parent_theme ) { ?>
%2$s. The stylesheet files are located in %3$s. %4$s uses templates from %5$s. Changes made to the templates will affect both themes.'), $ct->title, str_replace( WP_CONTENT_DIR, '', $ct->template_dir ), str_replace( WP_CONTENT_DIR, '', $ct->stylesheet_dir ), $ct->title, $ct->parent_theme); ?>
%2$s.'), $ct->title, str_replace( WP_CONTENT_DIR, '', $ct->template_dir ), str_replace( WP_CONTENT_DIR, '', $ct->stylesheet_dir ) ); ?>
@@ -265,7 +265,7 @@ foreach ( $cols as $col => $theme_name ) {
printf(__('%1$s %2$s by %3$s'), $title, $version, $author) ; ?>
-
%2$s. The stylesheet files are located in %3$s. %4$s uses templates from %5$s. Changes made to the templates will affect both themes.'), $title, str_replace( WP_CONTENT_DIR, '', $template_dir ), str_replace( WP_CONTENT_DIR, '', $stylesheet_dir ), $title, $parent_theme); ?>
@@ -298,7 +298,7 @@ foreach ( $cols as $col => $theme_name ) {
diff --git a/wp-admin/upgrade.php b/wp-admin/upgrade.php
index 3cee5a14c..6d2576786 100644
--- a/wp-admin/upgrade.php
+++ b/wp-admin/upgrade.php
@@ -85,11 +85,6 @@ switch ( $step ) :
$backto = !empty($_GET['backto']) ? stripslashes( urldecode( $_GET['backto'] ) ) : __get_option( 'home' ) . '/';
$backto = esc_url_raw( $backto );
$backto = wp_validate_redirect($backto, __get_option( 'home' ) . '/');
- if ( $wpdb->get_row( "SELECT blog_id FROM {$wpdb->blog_versions} WHERE blog_id = '{$wpdb->blogid}'" ) ) {
- $wpdb->query( "UPDATE {$wpdb->blog_versions} SET db_version = '{$wp_db_version}' WHERE blog_id = '{$wpdb->blogid}'" );
- } else {
- $wpdb->query( "INSERT INTO {$wpdb->blog_versions} ( `blog_id` , `db_version` , `last_updated` ) VALUES ( '{$wpdb->blogid}', '{$wp_db_version}', NOW());" );
- }
?>
diff --git a/wp-admin/users.php b/wp-admin/users.php
index eefaa4466..239e499a4 100644
--- a/wp-admin/users.php
+++ b/wp-admin/users.php
@@ -15,6 +15,10 @@ require_once( ABSPATH . WPINC . '/registration.php');
if ( !current_user_can('edit_users') )
wp_die(__('Cheatin’ uh?'));
+$del_cap_type = 'remove';
+if ( !is_multisite() && current_user_can('delete_users') )
+ $del_cap_type = 'delete';
+
$title = __('Users');
$parent_file = 'users.php';
@@ -43,22 +47,22 @@ switch ($doaction) {
case 'promote':
check_admin_referer('bulk-users');
- if (empty($_REQUEST['users'])) {
+ if ( empty($_REQUEST['users']) ) {
wp_redirect($redirect);
exit();
}
$editable_roles = get_editable_roles();
- if (!$editable_roles[$_REQUEST['new_role']])
+ if ( !$editable_roles[$_REQUEST['new_role']] )
wp_die(__('You can’t give users that role.'));
$userids = $_REQUEST['users'];
$update = 'promote';
- foreach($userids as $id) {
+ foreach ( $userids as $id ) {
if ( ! current_user_can('edit_user', $id) )
wp_die(__('You can’t edit that user.'));
// The new role of the current user must also have edit_users caps
- if($id == $current_user->ID && !$wp_roles->role_objects[$_REQUEST['new_role']]->has_cap('edit_users')) {
+ if ( $id == $current_user->ID && !$wp_roles->role_objects[$_REQUEST['new_role']]->has_cap('edit_users') ) {
$update = 'err_admin_role';
continue;
}
@@ -81,7 +85,7 @@ case 'dodelete':
exit();
}
- if ( !current_user_can('delete_users') )
+ if ( !current_user_can($del_cap_type . '_users') )
wp_die(__('You can’t delete users.'));
$userids = $_REQUEST['users'];
@@ -89,27 +93,25 @@ case 'dodelete':
$delete_count = 0;
foreach ( (array) $userids as $id) {
- if ( ! current_user_can('delete_user', $id) )
+ if ( ! current_user_can($del_cap_type . '_user', $id) )
wp_die(__('You can’t delete that user.'));
- if ($id == $current_user->ID) {
+ if ( $id == $current_user->ID ) {
$update = 'err_admin_del';
continue;
}
- switch($_REQUEST['delete_option']) {
+ switch ( $_REQUEST['delete_option'] ) {
case 'delete':
- if ( !is_multisite() ) {
+ if ( !is_multisite() && current_user_can('delete_user', $id) )
wp_delete_user($id);
- } else {
+ else
remove_user_from_blog($id, $blog_id); // WPMU only remove user from blog
- }
break;
case 'reassign':
- if ( !is_multisite() ) {
+ if ( !is_multisite() && current_user_can('delete_user', $id) )
wp_delete_user($id, $_REQUEST['reassign_user']);
- } else {
+ else
remove_user_from_blog($id, $blog_id, $_REQUEST['reassign_user']);
- }
break;
}
++$delete_count;
@@ -130,7 +132,7 @@ case 'delete':
exit();
}
- if ( !current_user_can('delete_users') )
+ if ( !current_user_can($del_cap_type . '_users') )
$errors = new WP_Error('edit_users', __('You can’t delete users.'));
if ( empty($_REQUEST['users']) )
diff --git a/wp-includes/capabilities.php b/wp-includes/capabilities.php
index 7b2dec82d..47f7d71b2 100644
--- a/wp-includes/capabilities.php
+++ b/wp-includes/capabilities.php
@@ -717,6 +717,10 @@ class WP_User {
$cap = $this->translate_level_to_cap( $cap );
}
+ // Multisite super admin has all caps by definition.
+ if ( is_multisite() && is_super_admin() )
+ return true;
+
$args = array_slice( func_get_args(), 1 );
$args = array_merge( array( $cap, $this->ID ), $args );
$caps = call_user_func_array( 'map_meta_cap', $args );
@@ -962,6 +966,9 @@ function map_meta_cap( $cap, $user_id ) {
case 'update_themes':
case 'install_themes':
case 'edit_themes':
+ case 'update_core':
+ case 'delete_user':
+ case 'delete_users':
// If multisite these caps are allowed only for super admins.
if ( is_multisite() && !is_super_admin() )
$caps[] = 'do_not_allow';
diff --git a/wp-includes/post.php b/wp-includes/post.php
index d17879606..f070bb69c 100644
--- a/wp-includes/post.php
+++ b/wp-includes/post.php
@@ -3251,12 +3251,10 @@ function wp_get_attachment_url( $post_id = 0 ) {
if ( ($uploads = wp_upload_dir()) && false === $uploads['error'] ) { //Get upload directory
if ( 0 === strpos($file, $uploads['basedir']) ) //Check that the upload base exists in the file location
$url = str_replace($uploads['basedir'], $uploads['baseurl'], $file); //replace file location with url location
- elseif ( !is_multisite() ) {
- if ( false !== strpos($file, 'wp-content/uploads') )
- $url = $uploads['baseurl'] . substr( $file, strpos($file, 'wp-content/uploads') + 18 );
- else
- $url = $uploads['baseurl'] . "/$file"; //Its a newly uploaded file, therefor $file is relative to the basedir.
- }
+ elseif ( false !== strpos($file, 'wp-content/uploads') )
+ $url = $uploads['baseurl'] . substr( $file, strpos($file, 'wp-content/uploads') + 18 );
+ else
+ $url = $uploads['baseurl'] . "/$file"; //Its a newly uploaded file, therefor $file is relative to the basedir.
}
}
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 513971eca..e14f2aca1 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -15,7 +15,7 @@ $wp_version = '3.0-alpha';
*
* @global int $wp_db_version
*/
-$wp_db_version = 12329;
+$wp_db_version = 12751;
/**
* Holds the TinyMCE version
diff --git a/wp-includes/wp-db.php b/wp-includes/wp-db.php
index 39e058033..8221ac094 100644
--- a/wp-includes/wp-db.php
+++ b/wp-includes/wp-db.php
@@ -370,14 +370,13 @@ class wpdb {
if ( WP_DEBUG )
$this->show_errors();
- if( is_multisite() ) {
- $this->charset = 'utf8';
- if( defined( 'DB_COLLATE' ) && constant( 'DB_COLLATE' ) != '' ) {
- $this->collate = constant( 'DB_COLLATE' );
- } else {
- $this->collate = 'utf8_general_ci';
- }
- }
+ if ( is_multisite() ) {
+ $this->charset = 'utf8';
+ if ( defined( 'DB_COLLATE' ) && constant( 'DB_COLLATE' ) != '' )
+ $this->collate = constant( 'DB_COLLATE' );
+ else
+ $this->collate = 'utf8_general_ci';
+ }
if ( defined('DB_CHARSET') )
$this->charset = DB_CHARSET;
@@ -446,12 +445,12 @@ class wpdb {
if ( preg_match('|[^a-z0-9_]|i', $prefix) )
return new WP_Error('invalid_db_prefix', /*WP_I18N_DB_BAD_PREFIX*/'Invalid database prefix'/*/WP_I18N_DB_BAD_PREFIX*/);
- if( is_multisite() ) {
- $old_prefix = '';
- } else {
- $old_prefix = $prefix;
- }
- if( isset( $this->base_prefix ) )
+ if ( is_multisite() )
+ $old_prefix = '';
+ else
+ $old_prefix = $prefix;
+
+ if ( isset( $this->base_prefix ) )
$old_prefix = $this->base_prefix;
$this->base_prefix = $prefix;
foreach ( $this->global_tables as $table )
@@ -664,22 +663,22 @@ class wpdb {
if ( !$this->show_errors )
return false;
- // If there is an error then take note of it
- if( is_multisite() ) {
- $msg = "WordPress database error: [$str]\n{$this->last_query}\n";
- if( defined( 'ERRORLOGFILE' ) )
- error_log( $msg, 3, CONSTANT( 'ERRORLOGFILE' ) );
- if( defined( 'DIEONDBERROR' ) )
- die( $msg );
- } else {
- $str = htmlspecialchars($str, ENT_QUOTES);
- $query = htmlspecialchars($this->last_query, ENT_QUOTES);
+ // If there is an error then take note of it
+ if ( is_multisite() ) {
+ $msg = "WordPress database error: [$str]\n{$this->last_query}\n";
+ if ( defined( 'ERRORLOGFILE' ) )
+ error_log( $msg, 3, CONSTANT( 'ERRORLOGFILE' ) );
+ if ( defined( 'DIEONDBERROR' ) )
+ die( $msg );
+ } else {
+ $str = htmlspecialchars($str, ENT_QUOTES);
+ $query = htmlspecialchars($this->last_query, ENT_QUOTES);
- print "
-
WordPress database error: [$str]
- $query
-
";
- }
+ print "
+
WordPress database error: [$str]
+ $query
+
";
+ }
}
/**
@@ -739,10 +738,10 @@ class wpdb {
function db_connect( $query = "SELECT" ) {
global $db_list, $global_db_list;
- if( is_array( $db_list ) == false )
+ if ( is_array( $db_list ) == false )
return true;
- if( $this->blogs != '' && preg_match("/(" . $this->blogs . "|" . $this->users . "|" . $this->usermeta . "|" . $this->site . "|" . $this->sitemeta . "|" . $this->sitecategories . ")/i",$query) ) {
+ if ( $this->blogs != '' && preg_match("/(" . $this->blogs . "|" . $this->users . "|" . $this->usermeta . "|" . $this->site . "|" . $this->sitemeta . "|" . $this->sitecategories . ")/i",$query) ) {
$action = 'global';
$details = $global_db_list[ mt_rand( 0, count( $global_db_list ) -1 ) ];
$this->db_global = $details;