fixes #764

2013-03-05 17:18:01 -05:00
parent 18dd8bd1e2
commit d912ba6172
2 changed files with 4 additions and 4 deletions
--- a/app/logical/session_loader.rb
+++ b/app/logical/session_loader.rb
@@ -41,7 +41,7 @@ private
  end
  
  def cookie_password_hash_valid?
-    cookies[:password_hash] && User.authenticate_cookie_hash(cookies.signed[:user_name], cookies[:password_hash])
+    cookies[:password_hash] && cookies.signed[:user_name] && User.authenticate_cookie_hash(cookies.signed[:user_name], cookies[:password_hash])
  end
  
  def update_last_logged_in_at
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -443,10 +443,10 @@ class User < ActiveRecord::Base
    end
    
    def tag_query_limit
-      if is_privileged?
-        Danbooru.config.base_tag_query_limit
-      elsif is_platinum?
+      if is_platinum?
        Danbooru.config.base_tag_query_limit * 2
+      elsif is_privileged?
+        Danbooru.config.base_tag_query_limit
      else
        2
      end