Ticket #25603: 25603.18.diff

src/wp-admin/about.php

@@ -63 +63 @@
                                         'mysql_version' => $required_mysql_version,
                                 );
                                 $can_auto_update = $upgrader->should_update( 'core', $future_minor_update, ABSPATH );
+
+                                // Test to see if we want to dispaly the admin email or not
+                                if ( (is_multisite() &&  current_user_can('manage_network_options') ) || 
+                                         (! is_multisite() && current_user_can('manage_options') )
+                                   )
+                                        $should_display_email = true;
+                                else
+                                        $should_display_email = false;
                         }
                         if ( $can_auto_update ) : ?>
                                 <p class="about-auto-update cool"><?php _e( 'This site <strong>is</strong> able to apply these updates automatically. Cool!' ); ?></p>
                         <?php else : ?>
-                                <p class="about-auto-update"><?php printf( __( 'This site <strong>is not</strong> able to apply these updates automatically. But we&#8217;ll email %s when there is a new security release.' ), esc_html( get_site_option( 'admin_email' ) ) ); ?></p>
+                                <?php if ( $upgrader->is_disabled()     ) : ?>
+                                        <p class="about-auto-update"><?php  _e( 'This site <strong>is not</strong> able to apply these updates automatically.' ); ?></p>
+
+                                <?php else : ?> 
+                                        <?php if ($should_display_email) : ?>           
+                                                <p class="about-auto-update"><?php printf( __( 'This site <strong>is not</strong> able to apply these updates automatically. But we&#8217;ll email %s when there is a new security release.' ), esc_html( get_site_option( 'admin_email' ) ) ); ?></p>
+                                        <?php else : ?> 
+                                                <p class="about-auto-update"><?php  _e( 'This site <strong>is not</strong> able to apply these updates automatically. But we&#8217;ll email the site administrator when there is a new security release.'); ?></p>
+                                        <?php endif; ?>
+                        <?php endif; ?>
                 <?php endif; ?>
         </div>
 </div>