Merge pull request #3451 from ossobv/sso_login_unapproved_account

Stop sso login processing after rendering error
2015-05-15 14:33:19 +02:00 · 2015-05-15 14:33:19 +02:00 · 93273cd17a
parent d40d308e45 d9a3e82516
commit 93273cd17a
1 changed files with 1 additions and 0 deletions
--- a/app/controllers/session_controller.rb
+++ b/app/controllers/session_controller.rb
@ -72,6 +72,7 @@ class SessionController < ApplicationController

        if SiteSetting.must_approve_users? && !user.approved?
          render text: I18n.t("sso.account_not_approved"), status: 403
+          return
        else
          log_on_user user
        end