lib/card/fetch/retrieve.rb in card-1.101.4 vs lib/card/fetch/retrieve.rb in card-1.101.5

- old
+ new

@@ -3,10 +3,11 @@ # retrieval and instantiation methods for Card::Fetch module Retrieve # look for card in cache. if that doesn't work, look in database def retrieve_existing return unless mark.present? + retrieve_from_cache || retrieve_from_db end def retrieve_from_cache @card = Card.send "retrieve_from_cache_by_#{mark_type}", @@ -24,9 +25,10 @@ card end def retrieval_from_db_query return unless (query = retrieval_from_db_query_base) + query[:trash] = false unless look_in_trash? query end def retrieval_from_db_query_base