Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-09-26 14:23:00 +02:00
Code Issues Projects Releases Wiki Activity

Customizer Theme Switcher: Fix preview URL for subfolder installs.

Browse Source 
Use `$_SERVER['HTTP_HOST']` and `$_SERVER['REQUEST_URI']` instead of `site_url()` and `$_SERVER['REQUEST_URI']`.

fixes #31896.
Built from https://develop.svn.wordpress.org/trunk@32086


git-svn-id: http://core.svn.wordpress.org/trunk@32065 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Dominik Schilling 2015-04-08 18:59:27 +00:00
parent 510473be14
commit f7fd1665ae
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
wp-includes/class-wp-customize-control.php
View File

@ -1242,7 +1242,8 @@ class WP_Customize_Theme_Control extends WP_Customize_Control {
* @access public
*/
public function content_template() {
$preview_url = site_url( add_query_arg( 'theme', '{{ data.theme.id }}' ) );
$current_url = set_url_scheme( 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'] );
$preview_url = add_query_arg( 'theme', '{{ data.theme.id }}', $current_url );
?>
<div class="theme" tabindex="0" data-preview-url="<?php echo esc_attr( $preview_url ); ?>" aria-describedby="{{ data.theme.id }}-action {{ data.theme.id }}-name">
<# if ( data.theme.screenshot[0] ) { #>

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.2-beta4-32085';
$wp_version = '4.2-beta4-32086';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.