Changeset 2057

Timestamp:

10/26/2009 06:13:26 PM (15 years ago)

Author:

apeatling

Message:

Fixes #1217

Location:

branches/1.1

Files:

• bp-core.php (modified) (1 diff)
• bp-core/bp-core-settings.php (modified) (1 diff)

branches/1.1/bp-core.php

@@ -1546 +1546 @@
 
     /* Make sure account deletion is not disabled */
-    if ( ( !(int) get_site_option( 'bp-disable-account-deletion' ) && !is_site_admin() ) )
+    if ( ( '' != get_site_option( 'bp-disable-account-deletion' ) || (int) get_site_option( 'bp-disable-account-deletion' ) ) && !is_site_admin() )
         return false;
 

branches/1.1/bp-core/bp-core-settings.php

@@ -154 +154 @@
 /**** DELETE ACCOUNT ****/
 
-function bp_core_screen_delete_account() {
-    global $current_user, $bp_settings_updated, $pass_error;
-    
-    if ( isset( $_POST['delete-account-button'] ) ) {
+function bp_core_screen_delete_account() {  
+    if ( isset( $_POST['delete-account-understand'] ) ) {
         check_admin_referer( 'delete-account' );
-        
+
         // delete the users account
         if ( bp_core_delete_account() )
             bp_core_redirect( site_url() );
-    }
-    
-    $bp_settings_updated = false;
-    $pass_error = false;
-    
-    if ( isset($_POST['submit']) ) {
-        check_admin_referer('bp_settings_general');
-        
-        require_once( WPINC . '/registration.php' );
-        
-        // Form has been submitted and nonce checks out, lets do it.
-        
-        if ( $_POST['email'] != '' ) {
-            $current_user->user_email = wp_specialchars( trim( $_POST['email'] ));
-        }
-
-        if ( $_POST['pass1'] != '' && $_POST['pass2'] != '' ) {
-            if ( $_POST['pass1'] == $_POST['pass2'] && !strpos( " " . $_POST['pass1'], "\\" ) ) {
-                $current_user->user_pass = $_POST['pass1'];
-            } else {
-                $pass_error = true;
-            }
-        } else if ( empty( $_POST['pass1'] ) && !empty( $_POST['pass2'] ) || !empty( $_POST['pass1'] ) && empty( $_POST['pass2'] ) ) {
-            $pass_error = true;
-        } else {
-            unset( $current_user->user_pass );
-        }
-        
-        if ( !$pass_error && wp_update_user( get_object_vars( $current_user ) ) )
-            $bp_settings_updated = true;
     }