Changeset 31933

Timestamp:

03/30/2015 07:21:01 PM (10 years ago)

Author:

ocean90

Message:

Customizer: Revert [31911]. We want to preserve url and return URL parameters to make the experience smoother.

see #31782.

Location:

trunk/src

Files:

• wp-admin/includes/theme.php (modified) (1 diff)
• wp-includes/class-wp-customize-control.php (modified) (1 diff)

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

@@ -533 +533 @@
                 <# if ( ! data.active ) { #>
                     <div class="inactive-theme">
-                        <a href="<?php echo add_query_arg( 'theme', '{{ data.id }}', remove_query_arg( 'theme' ) ); ?>" target="_top" class="button button-primary"><?php _e( 'Live Preview' ); ?></a>
+                        <a href="<?php echo add_query_arg( 'theme', '{{ data.id }}' ); ?>" target="_top" class="button button-primary"><?php _e( 'Live Preview' ); ?></a>
                     </div>
                 <# } #>

trunk/src/wp-includes/class-wp-customize-control.php

@@ -1226 +1226 @@
             <# if ( ! data.theme.active ) { #>
                 <div class="theme-actions">
-                    <a class="button" href="{{ data.theme.actions.customize }}" target="_top"><?php _e( 'Live Preview' ); ?></a>
+                    <a class="button" href="<?php echo add_query_arg( 'theme', '{{ data.theme.id }}' ); ?>" target="_top"><?php _e( 'Live Preview' ); ?></a>
                 </div>
             <# } #>