WordPress-C/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2025-02-16 11:35:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make sure WP_Customize_Manager::theme() never returns null.

Browse Source 
* Fixes issue in [31533] that caused unit test fatal error

fixes #31445
Built from https://develop.svn.wordpress.org/trunk@31536


git-svn-id: http://core.svn.wordpress.org/trunk@31517 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Mark Jaquith 2015-02-25 03:54:25 +00:00
parent ce8defbeb4
commit bd2c067245
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -314,6 +314,9 @@ final class WP_Customize_Manager {
* @return WP_Theme
*/
public function theme() {
if ( ! $this->theme ) {
$this->theme = wp_get_theme();
}
return $this->theme;
}

2
wp-includes/version.php
View File

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