Ticket #11282: 11282.diff

wp-login.php

@@ -8 +8 @@
  * @package WordPress
  */
 
+// Note that this is the login page
+define( 'WP_LOGIN_PAGE', true);
+
 /** Make sure that the WordPress bootstrap has run before continuing. */
 require( dirname(__FILE__) . '/wp-load.php' );
 

wp-settings.php

@@ -273 +273 @@
 
 do_action( 'after_setup_theme' );
 
+// Check that we have a working theme to output with
+validate_active_theme();
+
 // Load any template functions the theme supports.
 require_if_theme_supports( 'post-thumbnails', ABSPATH . WPINC . '/post-thumbnail-template.php' );
 

wp-admin/themes.php

@@ -48 +48 @@
 }
 ?>
 
-<?php if ( ! validate_current_theme() ) : ?>
-<div id="message1" class="updated"><p><?php _e('The active theme is broken.  Reverting to the default theme.'); ?></p></div>
+<?php if ( is_wp_error( validate_current_theme() ) ) : ?>
+<div id="message1" class="updated"><p><?php _e('The active theme is broken.  Reverting to the fallback theme.'); ?></p></div>
 <?php elseif ( isset($_GET['activated']) ) :
                 if ( isset($wp_registered_sidebars) && count( (array) $wp_registered_sidebars ) ) { ?>
 <div id="message2" class="updated"><p><?php printf(__('New theme activated. This theme supports widgets, please visit the <a href="%s">widgets settings page</a> to configure them.'), admin_url('widgets.php') ); ?></p></div><?php

wp-includes/load.php

@@ -577 +577 @@
         return false;
 }
 
+function is_login() {
+        if ( defined( 'WP_LOGIN_PAGE' ) )
+                return WP_LOGIN_PAGE;
+        return false;
+}
+
 ?>
+ No newline at end of file

wp-includes/theme.php

@@ -1184 +1184 @@
  * @since 1.5.0
  * @see WP_FALLBACK_THEME
  *
- * @return bool
+ * @param bool $switch_if_invalid Whether or not to switch the theme to the fallback if it is invalid
+ * @return WP_Error | bool - true if valid or WP_Error with a message if not
  */
-function validate_current_theme() {
+function validate_current_theme( $switch_if_invalid = true, $check_fallback = false) {
         // Don't validate during an install/upgrade.
         if ( defined('WP_INSTALLING') || !apply_filters( 'validate_current_theme', true ) )
                 return true;
 
-        if ( get_template() != WP_FALLBACK_THEME && !file_exists(get_template_directory() . '/index.php') ) {
+        $valid = true;
+        
+        if ( ( $check_fallback || get_template() != WP_FALLBACK_THEME ) && !file_exists(get_template_directory() . '/index.php') )
+                $valid = new WP_Error( 'theme_missing_index', sprintf( __( 'The current theme is missing the required file index.php please <a href="%s">switch</a> to a valid theme.' ), admin_url('themes.php') ) ) ;
+                
+        if ( ( $check_fallback || get_stylesheet() != WP_FALLBACK_THEME ) && !file_exists(get_stylesheet_directory() . '/style.css') )
+                $valid = new WP_Error( 'theme_missing_style', sprintf( __( 'The current theme is missing the required file style.css please <a href="%s">switch</a> to a valid theme.' ), admin_url('themes.php') ) ) ;
+        
+        if ( $switch_if_invalid && is_wp_error($valid) )
                 switch_theme( WP_FALLBACK_THEME, WP_FALLBACK_THEME );
-                return false;
-        }
+        
+        return $valid;
+}
 
-        if ( get_stylesheet() != WP_FALLBACK_THEME && !file_exists(get_template_directory() . '/style.css') ) {
-                switch_theme( WP_FALLBACK_THEME, WP_FALLBACK_THEME );
-                return false;
+/**
+ * Checks that active theme files 'index.php' and 'style.css' exists.
+ * 
+ * Will report an error if the theme is not valid
+ *
+ * @since 3.0.0
+ *
+ * @return nothing
+ */
+function validate_active_theme() {
+        $is_valid = validate_current_theme(false, true);
+        
+        if ( is_wp_error( $is_valid ) && !is_admin() && !is_login() ) {
+                // Allow for a custom page to be displayed
+                do_action( 'active_theme_invalid', $is_valid );
+                wp_die($is_valid);
         }
-
-        return true;
 }
 
 /**