Issue #2347825 by Jeff Schuler: Changed order of conditionals to minimize...

Issue #2347825 by Jeff Schuler: Changed order of conditionals to minimize problem with custom theme.

README.txt

@@ -74,11 +74,11 @@ INSTALLATION
    - Go to Configuration -> System -> Custom error
    - Enter any title and description you want for the 404 (not found)
      and 403 (access denied) pages.
-   - The Set theme to be used on the error pages. The first option
-     (System default) lets the system set the theme. Each of the
-     remaining options lets you set an explicit theme to be used on
-     error pages (but it will not override the administration theme,
-     if set).
+   - You may also set theme to be used on the error pages. The first
+     option (System default) lets the system set the theme. Each of
+     the remaining options lets you set an explicit theme to be used
+     on error pages (but it will not override the administration
+     theme, if set).
    - You can use any HTML tags to format the text.
    Click on Save configuration.
 

customerror.module

@@ -362,13 +362,13 @@ function customerror_form_search_theme_form_alter(&$form, &$form_state, $form_id
  */
 
 function customerror_custom_theme() {
- if (drupal_valid_path(current_path())) {
-    return;
-  }
   $theme = variable_get('customerror_theme', 0);
   if (!$theme) {
     return;
   }
+ if (drupal_valid_path(current_path())) {
+    return;
+  }
   return $theme;
 }