Changeset 26529 for trunk/src/wp-admin/includes/theme.php

Timestamp:

12/02/2013 06:45:28 PM (11 years ago)

Author:

nacin

Message:

Themes: Always include the current theme in the list, even if it is not allowed.

see #25948.

File:

• trunk/src/wp-admin/includes/theme.php (modified) (2 diffs)

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

@@ -377 +377 @@
  */
 function wp_prepare_themes_for_js( $themes = null ) {
+    $prepared_themes = array();
+    $current_theme = get_stylesheet();
+
     if ( null === $themes ) {
         $themes = wp_get_themes( array( 'allowed' => true ) );
-    }
-
-    $prepared_themes = array();
-    $current_theme = get_stylesheet();
+        if ( ! isset( $themes[ $current_theme ] ) ) {
+            $themes[ $current_theme ] = wp_get_theme();
+        }
+    }
 
     $updates = array();
@@ -416 +419 @@
             'actions'      => array(
                 'activate' => current_user_can( 'switch_themes' ) ? wp_nonce_url( admin_url( 'themes.php?action=activate&stylesheet=' . $encoded_slug ), 'switch-theme_' . $slug ) : null,
-                'customize'=> current_user_can( 'edit_theme_options' ) ? admin_url( 'customize.php?theme=' . $encoded_slug ) : null,
+                'customize'=> current_user_can( 'edit_theme_options' ) ? wp_customize_url( $slug ) : null,
                 'delete'   => current_user_can( 'delete_themes' ) ? wp_nonce_url( admin_url( 'themes.php?action=delete&stylesheet=' . $encoded_slug ), 'delete-theme_' . $slug ) : null,
             ),