From d912ba6172302ed5d6ae799007afa7cd9db40a24 Mon Sep 17 00:00:00 2001 From: albert Date: Tue, 5 Mar 2013 17:18:01 -0500 Subject: [PATCH] fixes #764 --- app/logical/session_loader.rb | 2 +- app/models/user.rb | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/logical/session_loader.rb b/app/logical/session_loader.rb index ffc92f745..1924e7dc8 100644 --- 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 diff --git a/app/models/user.rb b/app/models/user.rb index d91c4ca12..2a8feda32 100644 --- 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