diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2007-10-26 16:50:19 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2007-10-26 16:50:19 +0000 |
| commit | d1174c0013283b8dc16c5349eac995fe2a1039ad (patch) | |
| tree | 9102d9a91f56ba2e92e729f09d6fb118856bb78d /wp-admin/wpmu-edit.php | |
| parent | b6993d5766a5630574951bf4e62c7e55ae92c090 (diff) | |
| download | wordpress-mu-d1174c0013283b8dc16c5349eac995fe2a1039ad.tar.gz wordpress-mu-d1174c0013283b8dc16c5349eac995fe2a1039ad.tar.xz wordpress-mu-d1174c0013283b8dc16c5349eac995fe2a1039ad.zip | |
Don't use $wpmuBaseTablePrefix any more, use $wpdb->base_prefix, props lunabyte, fixes #479
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1134 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-admin/wpmu-edit.php')
| -rw-r--r-- | wp-admin/wpmu-edit.php | 16 |
1 files changed, 8 insertions, 8 deletions
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 ); |