Changeset 20477

Timestamp:

04/16/2012 02:36:47 PM (14 years ago)

Author:

nacin

Message:

Theme Customizer: Stick to wp_customize_url() instead of wp_customize_href(). Switch argument order so it is stylesheet-template. (Template is hypothetically optional, but the function will not support that.) see #19910.

Move to ->display('Name'), as ->get('Name') is a raw, untranslated version of the header.

Location:

trunk

Files:

• wp-admin/includes/class-wp-themes-list-table.php (modified) (2 diffs)
• wp-admin/includes/class-wp-upgrader.php (modified) (2 diffs)
• wp-admin/themes.php (modified) (1 diff)
• wp-includes/theme.php (modified) (1 diff)

trunk/wp-admin/includes/class-wp-themes-list-table.php

@@ -137 +137 @@
                         $actions[] = '<a href="' . $preview_link . '" class="hide-if-customize" title="'
                                 . esc_attr( sprintf( __( 'Preview &#8220;%s&#8221;' ), $title ) ) . '">' . __( 'Preview' ) . '</a>'
-                                . '<a ' . wp_customize_href( $template, $stylesheet ) . ' class="load-customize hide-if-no-customize">'
+                                . '<a href="' . wp_customize_url( $stylesheet, $template ) . '" class="load-customize hide-if-no-customize">'
                                 . __( 'Customize' ) . '</a>';
                         if ( ! is_multisite() && current_user_can( 'delete_themes' ) )
@@ -155 +155 @@
                                 <?php endif; ?>
                         </a>
-                        <a <?php echo wp_customize_href( $template, $stylesheet ); ?> class="screenshot load-customize hide-if-no-customize">
+                        <a href="<?php echo wp_customize_url( $stylesheet, $template ); ?>" class="screenshot load-customize hide-if-no-customize">
                                 <?php if ( $screenshot = $theme->get_screenshot() ) : ?>
                                         <img src="<?php echo esc_url( $screenshot ); ?>" alt="" />

trunk/wp-admin/includes/class-wp-upgrader.php

@@ -1517 +1517 @@
                 $install_actions = array();
                 $install_actions['preview']  = '<a href="' . esc_url( $preview_link ) . '" class="hide-if-customize" title="' . esc_attr(sprintf(__('Preview &#8220;%s&#8221;'), $name ) ) . '">' . __('Preview') . '</a>';
-                $install_actions['preview'] .= '<a ' . wp_customize_href( $template, $stylesheet ) . ' class="hide-if-no-customize load-customize>' . __('Customize') . '</a>';
+                $install_actions['preview'] .= '<a href="' . wp_customize_url( $stylesheet, $template ) . '" class="hide-if-no-customize load-customize>' . __('Customize') . '</a>';
                 $install_actions['activate'] = '<a href="' . esc_url( $activate_link ) . '" class="activatelink" title="' . esc_attr( sprintf( __('Activate &#8220;%s&#8221;'), $name ) ) . '">' . __('Activate') . '</a>';
 
@@ -1580 +1580 @@
 
                         $update_actions['preview']  = '<a href="' . esc_url( $preview_link ) . '" class="hide-if-customize" title="' . esc_attr(sprintf(__('Preview &#8220;%s&#8221;'), $name ) ) . '">' . __('Preview') . '</a>';
-                        $update_actions['preview'] .= '<a ' . wp_customize_href( $template, $stylesheet ) . ' class="hide-if-no-customize load-customize">' . __('Customize') . '</a>';
+                        $update_actions['preview'] .= '<a href="' . wp_customize_url( $stylesheet, $template ) . '" class="hide-if-no-customize load-customize">' . __('Customize') . '</a>';
                         $update_actions['activate'] = '<a href="' . esc_url( $activate_link ) . '" class="activatelink" title="' . esc_attr( sprintf( __('Activate &#8220;%s&#8221;'), $name ) ) . '">' . __('Activate') . '</a>';
 

trunk/wp-admin/themes.php

@@ -123 +123 @@
 
 <div class="theme-options">
-        <a <?php echo wp_customize_href( $ct->get_template(), $ct->get_stylesheet() ); ?> class="load-customize hide-if-no-customize" title="<?php echo esc_attr( sprintf( __( 'Customize &#8220;%s&#8221;' ), $ct->get('Name') ) ); ?>"><?php _e( 'Customize' )?></a>
+        <a href="<?php echo wp_customize_url( $ct->get_stylesheet(), $ct->get_template() ); ?>" class="load-customize hide-if-no-customize" title="<?php echo esc_attr( sprintf( __( 'Customize &#8220;%s&#8221;' ), $ct->display('Name') ) ); ?>"><?php _e( 'Customize' )?></a>
         <span><?php _e( 'Options:' )?></span>
         <?php

trunk/wp-includes/theme.php

@@ -1600 +1600 @@
  * @since 3.4.0
  */
-function wp_customize_url( $template, $stylesheet = null ) {
-        $stylesheet = isset( $stylesheet ) ? $stylesheet : $template;
-        return admin_url( 'admin.php' ) . '?customize=on&template=' . $template . '&stylesheet=' . $stylesheet;
-}
-
-/**
- * Prints an href attribute to load the theme customizer.
- *
- * @since 3.4.0
- */
-function wp_customize_href( $template, $stylesheet = null ) {
-        $link = wp_customize_url( $template, $stylesheet );
-        return 'href="' . esc_url( $link ) . '"';
-}
+function wp_customize_url( $stylesheet, $template ) {
+        return esc_url( admin_url( 'admin.php' ) . '?customize=on&template=' . $template . '&stylesheet=' . $stylesheet );
+}