summaryrefslogtreecommitdiffstats
path: root/wp-admin
diff options
context:
space:
mode:
Diffstat (limited to 'wp-admin')
-rw-r--r--wp-admin/includes/mu.php24
-rw-r--r--wp-admin/user-edit.php4
-rw-r--r--wp-admin/wpmu-blogs.php4
-rw-r--r--wp-admin/wpmu-edit.php16
-rw-r--r--wp-admin/wpmu-upgrade-site.php4
5 files changed, 26 insertions, 26 deletions
diff --git a/wp-admin/includes/mu.php b/wp-admin/includes/mu.php
index 90d0343..78004a8 100644
--- a/wp-admin/includes/mu.php
+++ b/wp-admin/includes/mu.php
@@ -25,7 +25,7 @@ function check_upload_size( $file ) {
add_filter( 'wp_handle_upload_prefilter', 'check_upload_size' );
function wpmu_delete_blog($blog_id, $drop = false) {
- global $wpdb, $wpmuBaseTablePrefix;
+ global $wpdb;
if ( $blog_id != $wpdb->blogid ) {
$switch = true;
@@ -44,17 +44,17 @@ function wpmu_delete_blog($blog_id, $drop = false) {
update_blog_status( $blog_id, 'deleted', 1 );
if ( $drop ) {
- $drop_tables = array( $wpmuBaseTablePrefix . $blog_id . "_categories",
- $wpmuBaseTablePrefix . $blog_id . "_comments",
- $wpmuBaseTablePrefix . $blog_id . "_linkcategories",
- $wpmuBaseTablePrefix . $blog_id . "_links",
- $wpmuBaseTablePrefix . $blog_id . "_link2cat",
- $wpmuBaseTablePrefix . $blog_id . "_options",
- $wpmuBaseTablePrefix . $blog_id . "_post2cat",
- $wpmuBaseTablePrefix . $blog_id . "_postmeta",
- $wpmuBaseTablePrefix . $blog_id . "_posts",
- $wpmuBaseTablePrefix . $blog_id . "_referer_visitLog",
- $wpmuBaseTablePrefix . $blog_id . "_referer_blacklist" );
+ $drop_tables = array( $wpdb->base_prefix . $blog_id . "_categories",
+ $wpdb->base_prefix . $blog_id . "_comments",
+ $wpdb->base_prefix . $blog_id . "_linkcategories",
+ $wpdb->base_prefix . $blog_id . "_links",
+ $wpdb->base_prefix . $blog_id . "_link2cat",
+ $wpdb->base_prefix . $blog_id . "_options",
+ $wpdb->base_prefix . $blog_id . "_post2cat",
+ $wpdb->base_prefix . $blog_id . "_postmeta",
+ $wpdb->base_prefix . $blog_id . "_posts",
+ $wpdb->base_prefix . $blog_id . "_referer_visitLog",
+ $wpdb->base_prefix . $blog_id . "_referer_blacklist" );
reset( $drop_tables );
foreach ( (array) $drop_tables as $drop_table) {
diff --git a/wp-admin/user-edit.php b/wp-admin/user-edit.php
index e3c1a3a..ec5d3f6 100644
--- a/wp-admin/user-edit.php
+++ b/wp-admin/user-edit.php
@@ -36,10 +36,10 @@ check_admin_referer('update-user_' . $user_id);
if ( !current_user_can('edit_user', $user_id) )
wp_die(__('You do not have permission to edit this user.'));
-$cap = $wpdb->get_var( "SELECT meta_value FROM {$wpdb->usermeta} WHERE user_id = '{$user_id}' AND meta_key = '{$wpmuBaseTablePrefix}{$wpdb->blogid}_capabilities' AND meta_value = 'a:0:{}'" );
+$cap = $wpdb->get_var( "SELECT meta_value FROM {$wpdb->usermeta} WHERE user_id = '{$user_id}' AND meta_key = '{$wpdb->base_prefix}{$wpdb->blogid}_capabilities' AND meta_value = 'a:0:{}'" );
$errors = edit_user($user_id);
if( $cap == null )
- $wpdb->query( "DELETE FROM {$wpdb->usermeta} WHERE user_id = '{$user_id}' AND meta_key = '{$wpmuBaseTablePrefix}{$wpdb->blogid}_capabilities' AND meta_value = 'a:0:{}'" );
+ $wpdb->query( "DELETE FROM {$wpdb->usermeta} WHERE user_id = '{$user_id}' AND meta_key = '{$wpdb->base_prefix}{$wpdb->blogid}_capabilities' AND meta_value = 'a:0:{}'" );
if( !is_wp_error( $errors ) ) {
$redirect = "user-edit.php?user_id=$user_id&updated=true";
diff --git a/wp-admin/wpmu-blogs.php b/wp-admin/wpmu-blogs.php
index cdad29a..642e842 100644
--- a/wp-admin/wpmu-blogs.php
+++ b/wp-admin/wpmu-blogs.php
@@ -64,9 +64,9 @@ if ( $_GET['updated'] == 'true' ) {
switch( $_GET['action'] ) {
// Edit blog
case "editblog":
- $options = $wpdb->get_results( "SELECT * FROM {$wpmuBaseTablePrefix}{$id}_options WHERE option_name NOT LIKE 'rss%' AND option_name NOT LIKE '%user_roles'", ARRAY_A );
+ $options = $wpdb->get_results( "SELECT * FROM {$wpdb->base_prefix}{$id}_options WHERE option_name NOT LIKE 'rss%' AND option_name NOT LIKE '%user_roles'", ARRAY_A );
$details = $wpdb->get_row( "SELECT * FROM {$wpdb->blogs} WHERE blog_id = '{$id}'", ARRAY_A );
- $editblog_roles = get_blog_option( $id, "{$wpmuBaseTablePrefix}{$id}_user_roles" );
+ $editblog_roles = get_blog_option( $id, "{$wpdb->base_prefix}{$id}_user_roles" );
?>
<div class="wrap">
<h2><?php _e('Edit Blog'); ?></h2>
diff --git a/wp-admin/wpmu-edit.php b/wp-admin/wpmu-edit.php
index ae9c73d..d8438b9 100644
--- a/wp-admin/wpmu-edit.php
+++ b/wp-admin/wpmu-edit.php
@@ -175,11 +175,11 @@ switch( $_GET['action'] ) {
reset( $newroles );
foreach ( (array) $newroles as $userid => $role ) {
$role_len = strlen( $role );
- $existing_role = $wpdb->get_var( "SELECT meta_value FROM $wpdb->usermeta WHERE user_id = '$userid' AND meta_key = '" . $wpmuBaseTablePrefix . $id . "_capabilities'" );
+ $existing_role = $wpdb->get_var( "SELECT meta_value FROM $wpdb->usermeta WHERE user_id = '$userid' AND meta_key = '" . $wpdb->base_prefix . $id . "_capabilities'" );
if( false == $existing_role ) {
- $wpdb->query( "INSERT INTO " . $wpdb->usermeta . "( `umeta_id` , `user_id` , `meta_key` , `meta_value` ) VALUES ( NULL, '$userid', '" . $wpmuBaseTablePrefix . $id . "_capabilities', 'a:1:{s:" . strlen( $role ) . ":\"" . $role . "\";b:1;}')" );
+ $wpdb->query( "INSERT INTO " . $wpdb->usermeta . "( `umeta_id` , `user_id` , `meta_key` , `meta_value` ) VALUES ( NULL, '$userid', '" . $wpdb->base_prefix . $id . "_capabilities', 'a:1:{s:" . strlen( $role ) . ":\"" . $role . "\";b:1;}')" );
} elseif( $existing_role != "a:1:{s:" . strlen( $role ) . ":\"" . $role . "\";b:1;}" ) {
- $wpdb->query( "UPDATE $wpdb->usermeta SET meta_value = 'a:1:{s:" . strlen( $role ) . ":\"" . $role . "\";b:1;}' WHERE user_id = '$userid' AND meta_key = '" . $wpmuBaseTablePrefix . $id . "_capabilities'" );
+ $wpdb->query( "UPDATE $wpdb->usermeta SET meta_value = 'a:1:{s:" . strlen( $role ) . ":\"" . $role . "\";b:1;}' WHERE user_id = '$userid' AND meta_key = '" . $wpdb->base_prefix . $id . "_capabilities'" );
}
}
@@ -189,8 +189,8 @@ switch( $_GET['action'] ) {
if( is_array( $_POST['blogusers'] ) ) {
reset( $_POST['blogusers'] );
foreach ( (array) $_POST['blogusers'] as $key => $val ) {
- delete_usermeta( $key, $wpmuBaseTablePrefix.$id.'_capabilities' );
- delete_usermeta( $key, $wpmuBaseTablePrefix.$id.'_user_level' );
+ delete_usermeta( $key, $wpdb->base_prefix.$id.'_capabilities' );
+ delete_usermeta( $key, $wpdb->base_prefix.$id.'_user_level' );
delete_usermeta( $key, 'primary_blog', $id ); // Delete primary blog if need.
}
}
@@ -203,14 +203,14 @@ switch( $_GET['action'] ) {
unset( $_POST['role'] );
$_POST['role'] = $newroles[ $userid ];
if( $pass != '' ) {
- $cap = $wpdb->get_var( "SELECT meta_value FROM {$wpdb->usermeta} WHERE user_id = '{$userid}' AND meta_key = '{$wpmuBaseTablePrefix}{$wpdb->blogid}_capabilities' AND meta_value = 'a:0:{}'" );
+ $cap = $wpdb->get_var( "SELECT meta_value FROM {$wpdb->usermeta} WHERE user_id = '{$userid}' AND meta_key = '{$wpdb->base_prefix}{$wpdb->blogid}_capabilities' AND meta_value = 'a:0:{}'" );
$userdata = get_userdata($userid);
$_POST['pass1'] = $_POST['pass2'] = $pass;
$_POST['email'] = $userdata->user_email;
$_POST['rich_editing'] = $userdata->rich_editing;
edit_user( $userid );
if( $cap == null )
- $wpdb->query( "DELETE FROM {$wpdb->usermeta} WHERE user_id = '{$userid}' AND meta_key = '{$wpmuBaseTablePrefix}{$wpdb->blogid}_capabilities' AND meta_value = 'a:0:{}'" );
+ $wpdb->query( "DELETE FROM {$wpdb->usermeta} WHERE user_id = '{$userid}' AND meta_key = '{$wpdb->base_prefix}{$wpdb->blogid}_capabilities' AND meta_value = 'a:0:{}'" );
}
}
unset( $_POST['role'] );
@@ -224,7 +224,7 @@ switch( $_GET['action'] ) {
if( $userid ) {
$user = $wpdb->get_var( "SELECT user_id FROM " . $wpdb->usermeta . " WHERE user_id='$userid' AND meta_key='wp_" . $id . "_capabilities'" );
if( $user == false )
- $wpdb->query( "INSERT INTO " . $wpdb->usermeta . "( `umeta_id` , `user_id` , `meta_key` , `meta_value` ) VALUES ( NULL, '$userid', '" . $wpmuBaseTablePrefix . $id . "_capabilities', 'a:1:{s:" . strlen( $_POST['new_role'] ) . ":\"" . $_POST['new_role'] . "\";b:1;}')" );
+ $wpdb->query( "INSERT INTO " . $wpdb->usermeta . "( `umeta_id` , `user_id` , `meta_key` , `meta_value` ) VALUES ( NULL, '$userid', '" . $wpdb->base_prefix . $id . "_capabilities', 'a:1:{s:" . strlen( $_POST['new_role'] ) . ":\"" . $_POST['new_role'] . "\";b:1;}')" );
}
}
wpmu_admin_do_redirect( "wpmu-blogs.php?action=editblog&updated=true&id=".$id );
diff --git a/wp-admin/wpmu-upgrade-site.php b/wp-admin/wpmu-upgrade-site.php
index 114d76c..2d426b0 100644
--- a/wp-admin/wpmu-upgrade-site.php
+++ b/wp-admin/wpmu-upgrade-site.php
@@ -25,7 +25,7 @@ switch( $_GET['action'] ) {
echo "<ul>";
foreach( (array) $blogs as $details ) {
if( $details['spam'] == 0 && $details['deleted'] == 0 && $details['archived'] == 0 ) {
- $siteurl = $wpdb->get_var("SELECT option_value from {$wpmuBaseTablePrefix}{$details['blog_id']}_options WHERE option_name = 'siteurl'");
+ $siteurl = $wpdb->get_var("SELECT option_value from {$wpdb->base_prefix}{$details['blog_id']}_options WHERE option_name = 'siteurl'");
echo "<li>$siteurl</li>";
if( $http_fopen ) {
$fp = fopen( $siteurl . "wp-admin/upgrade.php?step=1", "r" );
@@ -67,4 +67,4 @@ switch( $_GET['action'] ) {
?>
</div>
-<?php include('admin-footer.php'); ?> \ No newline at end of file
+<?php include('admin-footer.php'); ?>
generated by cgit (git 2.34.1) at 2024-06-13 12:12:54 +0000