WordPress.org
Get WordPress

Make WordPress Core

Ticket #28605: 28605.4.diff

File 28605.4.diff, 12.1 KB (added by ocean90, 11 years ago)

Remove whitespace fixes, show help only when edit_theme_options && customize

  • src/wp-admin/admin-header.php

     
    177177
    178178<?php
    179179// Make sure the customize body classes are correct as early as possible.
    180 if ( current_user_can( 'edit_theme_options' ) )
     180if ( current_user_can( 'customize' ) ) {
    181181        wp_customize_support_script();
     182}
    182183?>
    183184
    184185<div id="wpwrap">

  • src/wp-admin/customize.php

     
    1212/** Load WordPress Administration Bootstrap */
    1313require_once( dirname( __FILE__ ) . '/admin.php' );
    1414
    15 if ( ! current_user_can( 'edit_theme_options' ) ) {
     15if ( ! current_user_can( 'customize' ) ) {
    1616        wp_die( __( 'Cheatin&#8217; uh?' ) );
    1717}
    1818
    … …  
    2424        $return = wp_validate_redirect( $return );
    2525}
    2626if ( ! $return ) {
     27        if ( $url ) {
    2728        $return = $url;
     29        } elseif ( current_user_can( 'edit_theme_options' ) ) {
     30                $return = admin_url( 'themes.php' );
     31        } else {
     32                $return = admin_url();
    2833}
     34}
    2935
    3036global $wp_scripts, $wp_customize;
    3137
    … …  
    112118                                submit_button( $save_text, 'primary save', 'save', false );
    113119                        ?>
    114120                        <span class="spinner"></span>
    115                         <a class="customize-controls-close" href="<?php echo esc_url( $return ? $return : admin_url( 'themes.php' ) ); ?>">
     121                        <a class="customize-controls-close" href="<?php echo esc_url( $return ); ?>">
    116122                                <span class="screen-reader-text"><?php _e( 'Cancel' ); ?></span>
    117123                        </a>
    118124                </div>

  • src/wp-admin/includes/class-wp-themes-list-table.php

     
    149149                        $actions['preview'] = '<a href="' . $preview_link . '" class="hide-if-customize" title="'
    150150                                . esc_attr( sprintf( __( 'Preview &#8220;%s&#8221;' ), $title ) ) . '">' . __( 'Preview' ) . '</a>';
    151151
    152                         if ( current_user_can( 'edit_theme_options' ) )
     152                        if ( current_user_can( 'edit_theme_options' ) && current_user_can( 'customize' ) ) {
    153153                                $actions['preview'] .= '<a href="' . wp_customize_url( $stylesheet ) . '" class="load-customize hide-if-no-customize">'
    154154                                        . __( 'Live Preview' ) . '</a>';
     155                        }
    155156
    156157                        if ( ! is_multisite() && current_user_can( 'delete_themes' ) )
    157158                                $actions['delete'] = '<a class="submitdelete deletion" href="' . wp_nonce_url( 'themes.php?action=delete&amp;stylesheet=' . urlencode( $stylesheet ), 'delete-theme_' . $stylesheet )

  • src/wp-admin/includes/class-wp-upgrader-skins.php

     
    522522
    523523                $install_actions = array();
    524524                $install_actions['preview']  = '<a href="' . esc_url( $preview_link ) . '" class="hide-if-customize" title="' . esc_attr( sprintf( __('Preview &#8220;%s&#8221;'), $name ) ) . '">' . __('Preview') . '</a>';
     525                if ( current_user_can( 'edit_theme_options' ) && current_user_can( 'customize' ) ) {
    525526                $install_actions['preview'] .= '<a href="' . wp_customize_url( $stylesheet ) . '" class="hide-if-no-customize load-customize" title="' . esc_attr( sprintf( __('Preview &#8220;%s&#8221;'), $name ) ) . '">' . __('Live Preview') . '</a>';
     527                }
    526528                $install_actions['activate'] = '<a href="' . esc_url( $activate_link ) . '" class="activatelink" title="' . esc_attr( sprintf( __('Activate &#8220;%s&#8221;'), $name ) ) . '">' . __('Activate') . '</a>';
    527529
    528530                if ( is_network_admin() && current_user_can( 'manage_network_themes' ) )
    … …  
    594596                        $activate_link = wp_nonce_url( $activate_link, 'switch-theme_' . $stylesheet );
    595597
    596598                        if ( get_stylesheet() == $stylesheet ) {
    597                                 if ( current_user_can( 'edit_theme_options' ) )
     599                                if ( current_user_can( 'edit_theme_options' ) && current_user_can( 'customize' ) ) {
    598600                                        $update_actions['preview']  = '<a href="' . wp_customize_url( $stylesheet ) . '" class="hide-if-no-customize load-customize" title="' . esc_attr( sprintf( __('Customize &#8220;%s&#8221;'), $name ) ) . '">' . __('Customize') . '</a>';
     601                                }
    599602                        } elseif ( current_user_can( 'switch_themes' ) ) {
    600603                                $update_actions['preview']  = '<a href="' . esc_url( $preview_link ) . '" class="hide-if-customize" title="' . esc_attr( sprintf( __('Preview &#8220;%s&#8221;'), $name ) ) . '">' . __('Preview') . '</a>';
     604                                if ( current_user_can( 'edit_theme_options' ) && current_user_can( 'customize' ) ) {
    601605                                $update_actions['preview'] .= '<a href="' . wp_customize_url( $stylesheet ) . '" class="hide-if-no-customize load-customize" title="' . esc_attr( sprintf( __('Preview &#8220;%s&#8221;'), $name ) ) . '">' . __('Live Preview') . '</a>';
     606                                }
    602607                                $update_actions['activate'] = '<a href="' . esc_url( $activate_link ) . '" class="activatelink" title="' . esc_attr( sprintf( __('Activate &#8220;%s&#8221;'), $name ) ) . '">' . __('Activate') . '</a>';
    603608                        }
    604609

  • src/wp-admin/includes/dashboard.php

     
    12811281        <p class="about-description"><?php _e( 'We&#8217;ve assembled some links to get you started:' ); ?></p>
    12821282        <div class="welcome-panel-column-container">
    12831283        <div class="welcome-panel-column">
     1284                <?php if ( current_user_can( 'customize' ) ): ?>
    12841285                <h4><?php _e( 'Get Started' ); ?></h4>
    12851286                <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>
     1287                <?php endif; ?>
    12861288                <a class="button button-primary button-hero hide-if-customize" href="<?php echo admin_url( 'themes.php' ); ?>"><?php _e( 'Customize Your Site' ); ?></a>
    12871289                <?php if ( current_user_can( 'install_themes' ) || ( current_user_can( 'switch_themes' ) && count( wp_get_themes( array( 'allowed' => true ) ) ) > 1 ) ) : ?>
    12881290                        <p class="hide-if-no-customize"><?php printf( __( 'or, <a href="%s">change your theme completely</a>' ), admin_url( 'themes.php' ) ); ?></p>

  • src/wp-admin/includes/theme.php

     
    430430                        'update'       => get_theme_update_available( $theme ),
    431431                        'actions'      => array(
    432432                                'activate' => current_user_can( 'switch_themes' ) ? wp_nonce_url( admin_url( 'themes.php?action=activate&amp;stylesheet=' . $encoded_slug ), 'switch-theme_' . $slug ) : null,
    433                                 'customize'=> current_user_can( 'edit_theme_options' ) ? wp_customize_url( $slug ) : null,
     433                                'customize' => ( current_user_can( 'edit_theme_options' ) && current_user_can( 'customize' ) ) ? wp_customize_url( $slug ) : null,
    434434                                'preview'   => add_query_arg( array(
    435435                                        'preview'        => 1,
    436436                                        'template'       => urlencode( $theme->get_template() ),

  • src/wp-admin/menu.php

     
    148148        $submenu['themes.php'][5] = array( __( 'Themes' ), $appearance_cap, 'themes.php' );
    149149
    150150        $customize_url = add_query_arg( 'return', urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) ), 'customize.php' );
    151         $submenu['themes.php'][6] = array( __( 'Customize' ), 'edit_theme_options', $customize_url, '', 'hide-if-no-customize' );
     151        $submenu['themes.php'][6] = array( __( 'Customize' ), 'customize', $customize_url, '', 'hide-if-no-customize' );
    152152        unset( $customize_url );
    153153        if ( current_theme_supports( 'menus' ) || current_theme_supports( 'widgets' ) ) {
    154154                $submenu['themes.php'][10] = array(__( 'Menus' ), 'edit_theme_options', 'nav-menus.php');

  • src/wp-admin/themes.php

     
    6767} // install_themes
    6868
    6969// Help tab: Previewing and Customizing
    70 if ( current_user_can( 'edit_theme_options' ) ) {
     70if ( current_user_can( 'edit_theme_options' ) && current_user_can( 'customize' ) ) {
    7171        $help_customize =
    7272                '<p>' . __( 'Tap or hover on any theme then click the Live Preview button to see a live preview of that theme and change theme options in a separate, full-screen view. You can also find a Live Preview button at the bottom of the theme details screen. Any installed theme can be previewed and customized in this way.' ) . '</p>'.
    7373                '<p>' . __( 'The theme being previewed is fully interactive &mdash; navigate to different pages to see how the theme handles posts, archives, and other page templates. The settings may differ depending on what theme features the theme being previewed supports. To accept the new settings and activate the theme all in one step, click the Save &amp; Activate button above the menu.' ) . '</p>' .
    … …  
    7878                'title'         => __( 'Previewing and Customizing' ),
    7979                'content'       => $help_customize
    8080        ) );
    81 } // edit_theme_options
     81} // edit_theme_options & customize
    8282
    8383get_current_screen()->set_help_sidebar(
    8484        '<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
    … …  
    212212        <div class="theme-actions">
    213213
    214214        <?php if ( $theme['active'] ) { ?>
    215                 <?php if ( $theme['actions']['customize'] ) { ?>
     215                <?php if ( $theme['actions']['customize'] && current_user_can( 'edit_theme_options' ) && current_user_can( 'customize' ) ) { ?>
    216216                        <a class="button button-primary customize load-customize hide-if-no-customize" href="<?php echo $theme['actions']['customize']; ?>"><?php _e( 'Customize' ); ?></a>
    217217                <?php } ?>
    218218        <?php } else { ?>
    219219                <a class="button button-primary activate" href="<?php echo $theme['actions']['activate']; ?>"><?php _e( 'Activate' ); ?></a>
     220                <?php if ( current_user_can( 'edit_theme_options' ) && current_user_can( 'customize' ) ) { ?>
    220221                <a class="button button-secondary load-customize hide-if-no-customize" href="<?php echo $theme['actions']['customize']; ?>"><?php _e( 'Live Preview' ); ?></a>
    221222                <a class="button button-secondary hide-if-customize" href="<?php echo $theme['actions']['preview']; ?>"><?php _e( 'Preview' ); ?></a>
    222223        <?php } ?>
     224        <?php } ?>
    223225
    224226        </div>
    225227

  • src/wp-includes/admin-bar.php

     
    660660        if ( ! current_user_can( 'edit_theme_options' ) )
    661661                return;
    662662
     663        if ( current_user_can( 'customize' ) ) {
    663664        $current_url = ( is_ssl() ? 'https://' : 'http://' ) . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
    664665        $wp_admin_bar->add_menu( array(
    665666                'parent' => 'appearance',
    … …  
    671672                ),
    672673        ) );
    673674        add_action( 'wp_before_admin_bar_render', 'wp_customize_support_script' );
     675        }
    674676
    675677        if ( current_theme_supports( 'widgets' )  )
    676678                $wp_admin_bar->add_menu( array( 'parent' => 'appearance', 'id' => 'widgets', 'title' => __('Widgets'), 'href' => admin_url('widgets.php') ) );

  • src/wp-includes/capabilities.php

     
    13041304                else
    13051305                        $caps[] = 'do_not_allow';
    13061306                break;
     1307        case 'customize' :
     1308                $caps[] = 'edit_theme_options';
     1309                break;
    13071310        default:
    13081311                // Handle meta capabilities for custom post types.
    13091312                $post_type_meta_caps = _post_type_meta_capabilities();

  • src/wp-includes/class-wp-customize-manager.php

     
    157157
    158158                show_admin_bar( false );
    159159
    160                 if ( ! current_user_can( 'edit_theme_options' ) )
     160                if ( ! current_user_can( 'customize' ) ) {
    161161                        $this->wp_die( -1 );
     162                }
    162163
    163164                $this->original_stylesheet = get_stylesheet();
    164165