Merge pull request #4680 from tomhughes/validate-page-numbers

[rails.git] / app / controllers / application_controller.rb

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index d80b286d60dda69842ccd0d0e902bc6e800ec425..f5accc3c44d2d65654105a828d5ccc0fc6e94b64 100644 (file)
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -69,6 +69,10 @@ class ApplicationController < ActionController::Base
     @oauth_token = current_user.oauth_token(Settings.oauth_application) if current_user && Settings.key?(:oauth_application)
   end
 
     @oauth_token = current_user.oauth_token(Settings.oauth_application) if current_user && Settings.key?(:oauth_application)
   end
 

+  def require_oauth_10a_support
+    report_error t("application.oauth_10a_disabled", :link => t("application.auth_disabled_link")), :forbidden unless Settings.oauth_10a_support
+  end
+

   ##
   # require the user to have cookies enabled in their browser
   def require_cookies
   ##
   # require the user to have cookies enabled in their browser
   def require_cookies