WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Customize: Ensure valid themes in the preview. 

Merge of [41397] to the 4.7 branch.

Built from https://develop.svn.wordpress.org/branches/4.7@41430


git-svn-id: http://core.svn.wordpress.org/branches/4.7@41263 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Dominik Schilling 2017-09-19 11:51:06 +00:00
parent a0af012ed0
commit c259dff63c
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-includes/class-wp-customize-manager.php
View File

@ -265,7 +265,7 @@ final class WP_Customize_Manager {
} }
$this->original_stylesheet = get_stylesheet(); $this->original_stylesheet = get_stylesheet();
$this->theme = wp_get_theme( $args['theme'] ); $this->theme = wp_get_theme( 0 === validate_file( $args['theme'] ) ? $args['theme'] : null );
$this->messenger_channel = $args['messenger_channel']; $this->messenger_channel = $args['messenger_channel'];
$this->_changeset_uuid = $args['changeset_uuid']; $this->_changeset_uuid = $args['changeset_uuid'];

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.7.6-alpha-41418'; $wp_version = '4.7.6-alpha-41430';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.