From f6390c8ad6fecc1f37052fa6e8f10026f70db93b Mon Sep 17 00:00:00 2001
From: Sam <sam.saffron@gmail.com>
Date: Mon, 30 Nov 2015 17:12:51 +1100
Subject: [PATCH] correct bad merge

---
 app/controllers/users_controller.rb | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 386ab9eccbf..83a5ede59eb 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -205,10 +205,13 @@ class UsersController < ApplicationController
     usernames = [params[:username]] if usernames.blank?
     usernames.each(&:downcase!)
 
-    groups = Group.where(name: users).pluck(:name)
-    users -= groups
+    groups = Group.where(name: usernames).pluck(:name)
+    usernames -= groups
+
+    result = User.where(staged: false)
+                 .where(username_lower: usernames)
+                 .pluck(:username_lower)
 
-    result = User.where(staged: false).where(username_lower: users).pluck(:username_lower)
     render json: {valid: result, valid_groups: groups}
   end