Merge branch 'FX-alan-search-404' into alan_develop

app/models/user.rb

@@ -1064,6 +1064,16 @@ class User < Principal
     anonymous_user
   end
 
+  # refactor User model find function,
+  # return anonymous user when can not find user id = user_id
+  def self.find (*args, &block)
+    begin
+      super
+    rescue
+      self.anonymous
+    end
+    # super
+  end
   # Salts all existing unsalted passwords
   # It changes password storage scheme from SHA1(password) to SHA1(salt + SHA1(password))
   # This method is used in the SaltPasswords migration and is to be kept as is