Commit c46e286b authored by Michael Pratt's avatar Michael Pratt Committed by arc

Add argument to account_pending

Redmine 2.4 adds an argument to the account_pending function.  Check if
this installation is at least version 2.4, and if so, call account_pending
with the additional argument.
parent 0af14640
......@@ -71,7 +71,13 @@ class RedmineOauthController < AccountController
if user.active?
successful_authentication(user)
else
account_pending
# Redmine 2.4 adds an argument to account_pending
if Redmine::VERSION::MAJOR > 2 or
(Redmine::VERSION::MAJOR == 2 and Redmine::VERSION::MINOR >= 4)
account_pending(user)
else
account_pending
end
end
end
end
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment