diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2007-01-22 18:52:20 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2007-01-22 18:52:20 +0000 |
| commit | ea9b1bc498ba77f55e65266d9263e341bcc0e167 (patch) | |
| tree | 8b29b12b738c3688e882f19ddbdec9a3e5c67154 /wp-admin/wpmu-edit.php | |
| parent | 1a8522093c85332a60f61bea05eeae0bf82eb574 (diff) | |
| download | wordpress-mu-ea9b1bc498ba77f55e65266d9263e341bcc0e167.tar.gz wordpress-mu-ea9b1bc498ba77f55e65266d9263e341bcc0e167.tar.xz wordpress-mu-ea9b1bc498ba77f55e65266d9263e341bcc0e167.zip | |
Removed autocomplete_css() because it possibly conflicts with advanced editor stuff:
http://trac.mu.wordpress.org/ticket/213
http://trac.mu.wordpress.org/ticket/176
http://trac.mu.wordpress.org/ticket/217
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@860 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-admin/wpmu-edit.php')
| -rw-r--r-- | wp-admin/wpmu-edit.php | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/wp-admin/wpmu-edit.php b/wp-admin/wpmu-edit.php index dd7bd06..f2a308b 100644 --- a/wp-admin/wpmu-edit.php +++ b/wp-admin/wpmu-edit.php @@ -24,7 +24,7 @@ switch( $_REQUEST[ 'action' ] ) { update_site_option( "limited_email_domains", '' ); } if( $_POST[ 'banned_email_domains' ] != '' ) { - update_site_option( "banned_email_domains", split( ' ', $_POST[ 'banned_email_domains' ] ) ); + update_site_option( "banned_email_domains", split( ' ', stripslashes($_POST[ 'banned_email_domains' ]) ) ); } else { update_site_option( "banned_email_domains", '' ); } @@ -212,6 +212,7 @@ switch( $_REQUEST[ 'action' ] ) { $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:{}'" ); @@ -240,7 +241,7 @@ switch( $_REQUEST[ 'action' ] ) { check_admin_referer('deleteblog'); if( $id != '0' && $id != '1' ) wpmu_delete_blog( $id, true ); - wp_redirect( add_query_arg( "updated", "blogdeleted", $_POST[ 'ref' ] ) ); + wp_redirect( add_query_arg( "updated", "blogdeleted", $_SERVER[ 'HTTP_REFERER' ] ) ); die(); break; case "allblogs": @@ -254,7 +255,8 @@ switch( $_REQUEST[ 'action' ] ) { if( $_POST[ 'blogfunction' ] == 'delete' ) { wpmu_delete_blog( $val, true ); } elseif( $_POST[ 'blogfunction' ] == 'spam' ) { - update_blog_status( $val, "spam", '1' ); + update_blog_status( $val, "spam", '1', 0 ); + set_time_limit(60); } } } |