From 5fc043f995eee66db7f779611f8e1984ce6ab16d Mon Sep 17 00:00:00 2001 From: Patrick J Cherry Date: Thu, 2 Feb 2012 10:59:22 +0000 Subject: Fixed array/hash confusion when merging conditions. --- lib/mauve/person.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/mauve/person.rb b/lib/mauve/person.rb index acab8b7..a10e86a 100644 --- a/lib/mauve/person.rb +++ b/lib/mauve/person.rb @@ -116,8 +116,8 @@ module Mauve @logger.warn "#{name} destination for #{@person.username} not set" if destination.nil? - if args.first.is_a?(Array) - conditions = @base_conditions.merge(args[0]) + if args.first.is_a?(Hash) + conditions = @base_conditions.merge(args.pop) else conditions = @base_conditions end -- cgit v1.2.1