From c56d16d33619e7e2a4196f7f9067aefb40378414 Mon Sep 17 00:00:00 2001
From: Toks <tttoksss@gmail.com>
Date: Thu, 23 Apr 2015 09:43:19 -0400
Subject: [PATCH] Put current user first, closes #2063

---
 app/assets/javascripts/autocomplete.js | 1 +
 app/models/user.rb                     | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/app/assets/javascripts/autocomplete.js b/app/assets/javascripts/autocomplete.js
index 3f0f3c8a4..4cdf8c322 100644
--- a/app/assets/javascripts/autocomplete.js
+++ b/app/assets/javascripts/autocomplete.js
@@ -301,6 +301,7 @@
       url: "/users.json",
       data: {
         "search[order]": "post_upload_count",
+        "search[current_user_first]": "true",
         "search[name_matches]": term + "*",
         "limit": 10,
       },
diff --git a/app/models/user.rb b/app/models/user.rb
index 7fe365213..c4f083b53 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -711,6 +711,10 @@ class User < ActiveRecord::Base
       if params[:id].present?
         q = q.where("id in (?)", params[:id].split(",").map(&:to_i))
       end
+
+      if params[:current_user_first] == "true" && !CurrentUser.is_anonymous?
+        q = q.order("id = #{CurrentUser.user.id.to_i} desc")
+      end
       
       case params[:order]
       when "name"