Changeset 13705 for trunk/wp-admin/options-general.php

Timestamp:

03/15/2010 05:18:00 PM (16 years ago)

Author:

nacin

Message:

Only show multisite admin email notice if the email was changed. Add a "Cancel" link so the nag doesn't stay forever if the admin ends up not changing the email. see #12192

File:

• trunk/wp-admin/options-general.php (modified) (1 diff)

trunk/wp-admin/options-general.php

@@ -107 +107 @@
 <span class="setting-description"><?php _e('This address is used for admin purposes. If you change this we will send you an e-mail at your new address to confirm it. <strong>The new address will not become active until confirmed.</strong>') ?></span>
 <?php
-if ( $new_admin_email = get_option( 'new_admin_email' ) ) : ?>
+$new_admin_email = get_option( 'new_admin_email' );
+if ( $new_admin_email && $new_admin_email != get_option('admin_email') ) : ?>
 <div class="updated inline">
-<p><?php printf( __('There is a pending change of the admin e-mail to <code>%s</code>.'), $new_admin_email ); ?></p>
+<p><?php printf( __('There is a pending change of the admin e-mail to <code>%1$s</code>. <a href="%2$s">Cancel</a>'), $new_admin_email, esc_url( admin_url( 'options.php?dismiss=new_admin_email' ) ) ); ?></p>
 </div>
 <?php endif; ?>