Merge branch 'develop' into help_develop

Conflicts:
	help/test/functional/tickets_controller_test.rb
	users/test/functional/application_controller_test.rb
	users/test/support/auth_test_helper.rb

1 files changed, 2 insertions, 2 deletions

diff --git a/users/app/controllers/controller_extension/authentication.rb b/users/app/controllers/controller_extension/authentication.rb
index e27b4da..1726278 100644
--- a/users/app/controllers/controller_extension/authentication.rb
+++ b/users/app/controllers/controller_extension/authentication.rb
@@ -7,8 +7,8 @@ module ControllerExtension::Authentication
     helper_method :current_user, :logged_in?, :admin?
   end
 
-  def current_user
-    @current_user ||= User.find(session[:user_id]) if session[:user_id]
+  def authentication_error
+    warden.winning_strategy.try(:message)
   end
 
   def logged_in?