Changeset 42122

Timestamp:

11/07/2017 04:16:11 AM (7 years ago)

Author:

westonruter

Message:

Customize: Fix logic inversion in [42113] which prevented themes from being installed in Customizer.

Also fix PHP notice related to parent themes and WordPress.org theme query results.

Props dd32, obenland, celloexpressions, westonruter, atachibana for testing.
See #42406, #37661.
Fixes #42442.

Location:

trunk/src

Files:

• wp-admin/js/customize-controls.js (modified) (2 diffs)
• wp-includes/class-wp-customize-manager.php (modified) (1 diff)

trunk/src/wp-admin/js/customize-controls.js

@@ -3203 +3203 @@
 
             // Prevent loading a non-active theme preview when there is a drafted/scheduled changeset.
-            if ( panel.canSwitchTheme( slug ) ) {
+            if ( ! panel.canSwitchTheme( slug ) ) {
                 deferred.reject({
                     errorCode: 'theme_switch_unavailable'
@@ -3300 +3300 @@
             // Prevent loading a non-active theme preview when there is a drafted/scheduled changeset.
             if ( ! panel.canSwitchTheme( themeId ) ) {
-                return deferred.reject().promise();
+                deferred.reject({
+                    errorCode: 'theme_switch_unavailable'
+                });
+                return deferred.promise();
             }
 

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

@@ -5447 +5447 @@
                 $theme->screenshot   = array( $theme->screenshot_url );
                 $theme->authorAndUri = $theme->author;
-                $theme->parent       = ( $theme->slug === $theme->template ) ? false : $theme->template; // The .org API does not seem to return the parent in a documented way; however, this check should yield a similar result in most cases.
+                // The .org API can return the full parent theme details if passed the 'parent' arg, or if passed the 'template' option it'll return that in the event it's a child theme.
+                if ( isset( $theme->parent ) ) {
+                    $theme->parent = $theme->parent['slug'];
+                } else {
+                    $theme->parent = false;
+                }
                 unset( $theme->slug );
                 unset( $theme->screenshot_url );