specify rescue_froms in site controller too

aughr · Oct 12, 2011 · c11d040 · c11d040
1 parent e587c40
commit c11d040
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/lib/controller_extensions.rb b/lib/controller_extensions.rb
@@ -1,7 +1,6 @@
 module ControllerExtensions    # for inclusion into ApplicationController
 
   def self.included(base)
-
     base.class_eval do
       rescue_from ReaderError::AccessDenied, :with => :access_denied
       rescue_from ReaderError::LoginRequired, :with => :login_required

diff --git a/lib/radiant-reader-extension.rb b/lib/radiant-reader-extension.rb
@@ -1,5 +1,5 @@
 module RadiantReaderExtension
-  VERSION = '3.0.18'
+  VERSION = '3.0.19'
   SUMMARY = %q{Reader/viewer/visitor registration, login and access-control for Radiant CMS}
   DESCRIPTION = %q{Provides reader/member/user registration and management functions including password-reminder, group-based page access control and administrative email.}
   URL = "http://radiant.spanner.org/reader"

diff --git a/lib/site_controller_extensions.rb b/lib/site_controller_extensions.rb
@@ -2,6 +2,10 @@ module SiteControllerExtensions
 
   def self.included(base)
     base.class_eval {
+      rescue_from ReaderError::AccessDenied, :with => :access_denied
+      rescue_from ReaderError::LoginRequired, :with => :login_required
+      rescue_from ReaderError::ActivationRequired, :with => :activation_required
+
       # NB. to control access without disabling the cache we have overridden Page.cache? 
       # to return false for any page that has a group association.