Changeset 25666

Timestamp:

10/02/2013 08:49:59 PM (11 years ago)

Author:

nacin

Message:

Show a proper error message on the dashboard when the current theme is broken.

Clean up Appearance -> Themes when we don't have enough information to show for a broken theme.

Clean up broken/ugly "alt" row styling when we are displaying broken themes.

props johnbillion for initial patch.
fixes #21670.

Location:

trunk/src

Files:

• wp-admin/includes/dashboard.php (modified) (1 diff)
• wp-admin/themes.php (modified) (3 diffs)
• wp-includes/class-wp-theme.php (modified) (1 diff)

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

@@ -367 +367 @@
     if ( $theme->errors() ) {
         if ( ! is_multisite() || is_super_admin() )
-            echo '<span class="error-message">' . __('ERROR: The themes directory is either empty or doesn&#8217;t exist. Please check your installation.') . '</span>';
+            echo '<span class="error-message">' . sprintf( __( 'ERROR: %s' ), $theme->errors()->get_error_message() ) . '</span>';
     } elseif ( ! empty($wp_registered_sidebars) ) {
         $sidebars_widgets = wp_get_sidebars_widgets();

trunk/src/wp-admin/themes.php

@@ -139 +139 @@
         <?php echo $ct->display('Name'); ?>
     </h4>
+
+<?php
+if ( $ct->errors() && ( ! is_multisite() || current_user_can( 'manage_network_themes' ) ) ) {
+    echo '<p class="error-message">' . sprintf( __( 'ERROR: %s' ), $ct->errors()->get_error_message() ) . '</p>';
+}
+
+// Certain error codes are less fatal than others. We can still display theme information in most cases.
+if ( ! $ct->errors() || ( 1 == count( $ct->errors()->get_error_codes() )
+    && in_array( $ct->errors()->get_error_code(), array( 'theme_no_parent', 'theme_parent_invalid', 'theme_no_index' ) ) ) ) : ?>
 
     <div>
@@ -208 +217 @@
     ?>
 
+<?php endif; // theme errors ?>
+
 </div>
 
@@ -293 +304 @@
     </tr>
 <?php
-    $alt = '';
     foreach ( $broken_themes as $broken_theme ) {
-        $alt = ('class="alternate"' == $alt) ? '' : 'class="alternate"';
         echo "
-        <tr $alt>
+        <tr>
              <td>" . $broken_theme->get('Name') ."</td>
              <td>" . $broken_theme->errors()->get_error_message() . "</td>

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

@@ -207 +207 @@
             $this->headers['Name'] = $this->stylesheet;
             if ( ! file_exists( $this->theme_root . '/' . $this->stylesheet ) )
-                $this->errors = new WP_Error( 'theme_not_found', __( 'The theme directory does not exist.' ) );
+                $this->errors = new WP_Error( 'theme_not_found', sprintf( __( 'The theme directory "%s" does not exist.' ), $this->stylesheet ) );
             else
                 $this->errors = new WP_Error( 'theme_no_stylesheet', __( 'Stylesheet is missing.' ) );