Changeset 2114 for trunk/bp-core.php

Timestamp:

11/24/2009 10:05:01 PM (17 years ago)

Author:

apeatling

Message:

Merging 1.1 branch fixes into trunk.

File:

• trunk/bp-core.php (modified) (2 diffs)

trunk/bp-core.php

@@ -1582 +1582 @@
 
         /* Make sure account deletion is not disabled */
-        if ( ( '' != get_site_option( 'bp-disable-account-deletion' ) || (int) get_site_option( 'bp-disable-account-deletion' ) ) && !is_site_admin() )
+        if ( (int)get_site_option( 'bp-disable-account-deletion' ) )
                 return false;
 
@@ -1806 +1806 @@
                 load_textdomain( 'buddypress', $mofile );
 }
-add_action ( 'plugins_loaded', 'bp_core_load_buddypress_textdomain', 9 );
+add_action ( 'plugins_loaded', 'bp_core_load_buddypress_textdomain', 5 );
 
 function bp_core_add_ajax_hook() {