WordPress.org

Make WordPress Core


Ignore:
Timestamp:
03/15/2010 05:18:00 PM (12 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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-admin/options-general.php

    r13702 r13705  
    107107<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>
    108108<?php
    109 if ( $new_admin_email = get_option( 'new_admin_email' ) ) : ?>
     109$new_admin_email = get_option( 'new_admin_email' );
     110if ( $new_admin_email && $new_admin_email != get_option('admin_email') ) : ?>
    110111<div class="updated inline">
    111 <p><?php printf( __('There is a pending change of the admin e-mail to <code>%s</code>.'), $new_admin_email ); ?></p>
     112<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>
    112113</div>
    113114<?php endif; ?>
Note: See TracChangeset for help on using the changeset viewer.