Changeset 12712 for trunk/wp-admin/options.php

Timestamp:

01/12/2010 09:11:52 PM (17 years ago)

Author:

wpmuguru

Message:

merge multisite admin - edit links,tags,cats,options, See #11644

Location:

trunk/wp-admin

Files:

• . (modified) (1 prop)
• options.php (modified) (5 diffs)

trunk/wp-admin/options.php

@@ -39 +39 @@
         wp_die(__('Cheatin’ uh?'));
 
+if ( is_multisite() && is_super_admin() && $_GET[ 'adminhash' ] ) {
+        $new_admin_details = get_option( 'adminhash' );
+        if( is_array( $new_admin_details ) && $new_admin_details[ 'hash' ] == $_GET[ 'adminhash' ] && $new_admin_details[ 'newemail' ] != '' ) {
+                update_option( "admin_email", $new_admin_details[ 'newemail' ] );
+                delete_option( "adminhash" );
+                delete_option( "new_admin_email" );
+                wp_redirect( get_option( "siteurl" ) . "/wp-admin/options-general.php?updated=true" );
+                exit;
+        } else {
+                wp_redirect( get_option( "siteurl" ) . "/wp-admin/options-general.php?updated=false" );
+                exit;
+        }
+}
+
 switch($action) {
 
@@ -56 +70 @@
         if ( 'options' == $option_page ) {
                 $options = explode(',', stripslashes( $_POST[ 'page_options' ] ));
+                if ( !is_super_admin() ) 
+                        wp_die( __( 'Not allowed here' ) );
         } else {
                 $options = $whitelist_options[ $option_page ];
@@ -91 +107 @@
 
 default:
+        if ( !is_super_admin() )
+                wp_die( __( 'Not admin' ) );
+
         include('admin-header.php'); ?>
 
@@ -100 +119 @@
   <input type="hidden" name="action" value="update" />
   <input type='hidden' name='option_page' value='options' />
+<?php if ( is_multisite() ) { ?>
+<p class="submit submit-top">
+        <input type="submit" name="Submit" value="<?php _e('Save Changes') ?>" class="button-primary" />
+</p>
+<?php } ?>
   <table class="form-table">
 <?php
@@ -107 +131 @@
         $disabled = '';
         $option->option_name = esc_attr($option->option_name);
+        if( $option->option_name == '' )
+                continue;
         if ( is_serialized($option->option_value) ) {
                 if ( is_serialized_string($option->option_value) ) {