Merge branch 'staging' into production

Leandro Santos
2 parents eec31785 c96fe96a
Showing 1 changed file with 0 additions and 1 deletions Show diff stats
lib/noosfero/api/helpers.rb
@@ -34,7 +34,6 @@ require &#39;grape&#39;
       def current_user
         private_token = (params[PRIVATE_TOKEN_PARAM] || headers['Private-Token']).to_s
         @current_user ||= User.find_by_private_token(private_token)
-        @current_user = nil if !@current_user.nil? && @current_user.private_token_expired?
         @current_user
       end
...	...	@@ -34,7 +34,6 @@ require 'grape'
34	34	def current_user
35	35	private_token = (params[PRIVATE_TOKEN_PARAM] \|\| headers['Private-Token']).to_s
36	36	@current_user \|\|= User.find_by_private_token(private_token)
37		- @current_user = nil if !@current_user.nil? && @current_user.private_token_expired?
38	37	@current_user
39	38	end
40	39
...	...