Changeset 14241

Timestamp:

04/26/2010 05:55:41 PM (16 years ago)

Author:

ryan

Message:

Allow regular admins to change the admin email. see #13126

File:

• trunk/wp-admin/options.php (modified) (2 diffs)

trunk/wp-admin/options.php

@@ -31 +31 @@
     wp_die(__('Cheatin’ uh?'));
 
+// Handle admin email change requests
+if ( is_multisite() ) {
+    if ( ! empty($_GET[ 'adminhash' ] ) ) {
+        $new_admin_details = get_option( 'adminhash' );
+        $redirect = 'options-general.php?updated=false';
+        if ( is_array( $new_admin_details ) && $new_admin_details[ 'hash' ] == $_GET[ 'adminhash' ] && !empty($new_admin_details[ 'newemail' ]) ) {
+            update_option( 'admin_email', $new_admin_details[ 'newemail' ] );
+            delete_option( 'adminhash' );
+            delete_option( 'new_admin_email' );
+            $redirect = 'options-general.php?updated=true';
+        }
+        wp_redirect( admin_url( $redirect ) );
+        exit;
+    } elseif ( ! empty( $_GET['dismiss'] ) && 'new_admin_email' == $_GET['dismiss'] ) {
+        delete_option( 'adminhash' );
+        delete_option( 'new_admin_email' );
+        wp_redirect( admin_url( 'options-general.php?updated=true' ) );
+        exit;
+    }
+}
+
 if ( is_multisite() && !is_super_admin() && 'update' != $action )
     wp_die(__('Cheatin’ uh?'));
@@ -72 +93 @@
 
 $whitelist_options = apply_filters( 'whitelist_options', $whitelist_options );
-
-if ( is_multisite() && is_super_admin() ) {
-    if ( ! empty($_GET[ 'adminhash' ] ) ) {
-        $new_admin_details = get_option( 'adminhash' );
-        $redirect = 'options-general.php?updated=false';
-        if ( is_array( $new_admin_details ) && $new_admin_details[ 'hash' ] == $_GET[ 'adminhash' ] && !empty($new_admin_details[ 'newemail' ]) ) {
-            update_option( 'admin_email', $new_admin_details[ 'newemail' ] );
-            delete_option( 'adminhash' );
-            delete_option( 'new_admin_email' );
-            $redirect = 'options-general.php?updated=true';
-        }
-        wp_redirect( admin_url( $redirect ) );
-        exit;
-    } elseif ( ! empty( $_GET['dismiss'] ) && 'new_admin_email' == $_GET['dismiss'] ) {
-        delete_option( 'adminhash' );
-        delete_option( 'new_admin_email' );
-        wp_redirect( admin_url( 'options-general.php?updated=true' ) );
-        exit;
-    }
-}
 
 /*