Changeset 20315

Timestamp:

03/29/2012 04:16:17 AM (13 years ago)

Author:

nacin

Message:

Always set WP_Theme->template even when there is an error and we have no idea what the template is. (Assume it is the stylesheet.) Prevents a number of issues including WP_Theme->is_child_theme() lying. Tidy the theme editor for broken themes and themes with no templates (PHP files), or no template (parent), or are broken. Allow broken themes to be edited. see #20103.

Location:

trunk

Files:

• wp-admin/theme-editor.php (modified) (6 diffs)
• wp-includes/class-wp-theme.php (modified) (3 diffs)

trunk/wp-admin/theme-editor.php

@@ -56 +56 @@
 
 $allowed_files = $theme->get_files( 'php', 1 );
+$has_templates = ! empty( $allowed_files );
+
 $style_files = $theme->get_files( 'css' );
 if ( isset( $style_files['style.css'] ) ) {
@@ -133 +135 @@
 
 $description = get_file_description( $file );
-$file_show = array_search( $file, $allowed_files );
+$file_show = array_search( $file, array_filter( $allowed_files ) );
 if ( $description != $file_show )
     $description .= ' <span>(' . $file_show . ')</span>';
@@ -143 +145 @@
 <div class="fileedit-sub">
 <div class="alignleft">
-<h3><?php echo $theme->display('Name') . ': ' . $description; ?></h3>
+<h3><?php echo $theme->display('Name'); if ( $description ) echo ': ' . $description; ?></h3>
 </div>
 <div class="alignright">
@@ -150 +152 @@
         <select name="theme" id="theme">
 <?php
-foreach ( wp_get_themes() as $a_stylesheet => $a_theme ) {
+foreach ( wp_get_themes( array( 'errors' => null ) ) as $a_stylesheet => $a_theme ) {
     $selected = $a_stylesheet == $stylesheet ? ' selected="selected"' : '';
     echo "\n\t" . '<option value="' . esc_attr( $a_stylesheet ) . '"' . $selected . '>' . $a_theme->display('Name') . '</option>';
@@ -163 +165 @@
     <div id="templateside">
 <?php
-if ( $allowed_files ) :
+if ( array_filter( $allowed_files ) ) :
+    if ( $has_templates || $theme->is_child_theme() ) :
 ?>
     <h3><?php _e('Templates'); ?></h3>
@@ -171 +174 @@
     <ul>
 <?php
+    endif;
+
     foreach ( $allowed_files as $filename => $absolute_filename ) :
         if ( 'style.css' == $filename ) {

trunk/wp-includes/class-wp-theme.php

@@ -200 +200 @@
             else
                 $this->errors = new WP_Error( 'theme_no_stylesheet', __( 'Stylesheet is missing.' ) );
-            $this->cache_add( 'theme', array( 'headers' => $this->headers, 'errors' => $this->errors, 'stylesheet' => $this->stylesheet ) );
+            $this->template = $this->stylesheet;
+            $this->cache_add( 'theme', array( 'headers' => $this->headers, 'errors' => $this->errors, 'stylesheet' => $this->stylesheet, 'template' => $this->template ) );
             if ( ! file_exists( $this->theme_root ) ) // Don't cache this one.
                 $this->errors->add( 'theme_root_missing', __( 'ERROR: The themes directory is either empty or doesn’t exist. Please check your installation.' ) );
@@ -207 +208 @@
             $this->headers['Name'] = $this->stylesheet;
             $this->errors = new WP_Error( 'theme_stylesheet_not_readable', __( 'Stylesheet is not readable.' ) );
-            $this->cache_add( 'theme', array( 'headers' => $this->headers, 'errors' => $this->errors, 'stylesheet' => $this->stylesheet ) );
+            $this->template = $this->stylesheet;
+            $this->cache_add( 'theme', array( 'headers' => $this->headers, 'errors' => $this->errors, 'stylesheet' => $this->stylesheet, 'template' => $this->template ) );
             return;
         } else {
@@ -219 +221 @@
         }
 
-        // (If template is set from cache, we know it's good.)
+        // (If template is set from cache [and there are no errors], we know it's good.)
         if ( ! $this->template && ! ( $this->template = $this->headers['Template'] ) ) {
-            if ( file_exists( $this->theme_root . '/' . $this->stylesheet . '/index.php' ) ) {
-                $this->template = $this->stylesheet;
-            } else {
+            $this->template = $this->stylesheet;
+            if ( ! file_exists( $this->theme_root . '/' . $this->stylesheet . '/index.php' ) ) {
                 $this->errors = new WP_Error( 'theme_no_index', __( 'Template is missing.' ) );
-                $this->cache_add( 'theme', array( 'headers' => $this->headers, 'errors' => $this->errors, 'stylesheet' => $this->stylesheet ) );
+                $this->cache_add( 'theme', array( 'headers' => $this->headers, 'errors' => $this->errors, 'stylesheet' => $this->stylesheet, 'template' => $this->template ) );
                 return;
             }