Changeset 42170 for branches/4.9

Timestamp:

11/13/2017 07:25:23 PM (7 years ago)

Author:

westonruter

Message:

Customize: Prevent PHP notice on theme-switch dashboard welcome link (and link to themes admin screen) when user cannot customize.

Props skostadinov, ocean90.
Amends [41699].
See #42050.
Fixes #42525 for 4.9.

Location:

branches/4.9

Files:

• . (modified) (1 prop)
• src/wp-admin/includes/dashboard.php (modified) (2 diffs)

branches/4.9/src/wp-admin/includes/dashboard.php

@@ -1568 +1568 @@
     <div class="welcome-panel-column-container">
     <div class="welcome-panel-column">
-        <?php if ( current_user_can( 'customize' ) ):
-            $customize_themes_link = add_query_arg( 'autofocus[panel]', 'themes', admin_url( 'customize.php' ) ); ?>
+        <?php if ( current_user_can( 'customize' ) ) : ?>
             <h3><?php _e( 'Get Started' ); ?></h3>
             <a class="button button-primary button-hero load-customize hide-if-no-customize" href="<?php echo wp_customize_url(); ?>"><?php _e( 'Customize Your Site' ); ?></a>
@@ -1575 +1574 @@
         <a class="button button-primary button-hero hide-if-customize" href="<?php echo admin_url( 'themes.php' ); ?>"><?php _e( 'Customize Your Site' ); ?></a>
         <?php if ( current_user_can( 'install_themes' ) || ( current_user_can( 'switch_themes' ) && count( wp_get_themes( array( 'allowed' => true ) ) ) > 1 ) ) : ?>
-            <p class="hide-if-no-customize"><?php printf( __( 'or, <a href="%s">change your theme completely</a>' ), $customize_themes_link ); ?></p>
+            <?php $themes_link = current_user_can( 'customize' ) ? add_query_arg( 'autofocus[panel]', 'themes', admin_url( 'customize.php' ) ) : admin_url( 'themes.php' ); ?>
+            <p class="hide-if-no-customize"><?php printf( __( 'or, <a href="%s">change your theme completely</a>' ), $themes_link ); ?></p>
         <?php endif; ?>
     </div>