Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix the build

This commit is contained in:
Régis Hanol 2016-01-15 12:34:28 +01:00
parent c9c6b09f36
commit 825a01cec3
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/application_controller.rb
View File

@ -252,7 +252,7 @@ class ApplicationController < ActionController::Base
username_lower = params[:username].downcase username_lower = params[:username].downcase
username_lower.gsub!(/\.json$/, '') username_lower.gsub!(/\.json$/, '')
find_opts = { username_lower: username_lower } find_opts = { username_lower: username_lower }
find_opts[:active] = true unless opts[:include_inactive] || current_user.staff? find_opts[:active] = true unless opts[:include_inactive] || current_user.try(:staff?)
User.find_by(find_opts) User.find_by(find_opts)
elsif params[:external_id] elsif params[:external_id]
external_id = params[:external_id].gsub(/\.json$/, '') external_id = params[:external_id].gsub(/\.json$/, '')