Merge branch 'develop' into feature/merge-wombleton-sparkly-admin-css

1 files changed, 12 insertions, 0 deletions

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 7e0096179..e305e90f4 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -118,6 +118,18 @@ class ApplicationController < ActionController::Base
 
     # Override default error handler, for production sites.
     def rescue_action_in_public(exception)
+        # Call `set_view_paths` from the theme, if it exists.
+        # Normally, this is called by the theme itself in a
+        # :before_filter, but when there's an error, this doesn't
+        # happen.  By calling it here, we can ensure error pages are
+        # still styled according to the theme.
+        begin
+            set_view_paths
+        rescue NameError => e
+            if !(e.message =~ /undefined local variable or method `set_view_paths'/)
+                raise
+            end
+        end
         # Make sure expiry time for session is set (before_filters are
         # otherwise missed by this override)
         session_remember_me