aboutsummaryrefslogtreecommitdiff
path: root/lib/mauve
diff options
context:
space:
mode:
authorPatrick J Cherry <patrick@bytemark.co.uk>2012-02-02 10:59:22 +0000
committerPatrick J Cherry <patrick@bytemark.co.uk>2012-02-02 10:59:22 +0000
commit5fc043f995eee66db7f779611f8e1984ce6ab16d (patch)
treed68ed9985c7436cd7d45a0aee85795f8ef939747 /lib/mauve
parentb218b7f7bbb60e0472328560e68f1762d7d08077 (diff)
Fixed array/hash confusion when merging conditions.
Diffstat (limited to 'lib/mauve')
-rw-r--r--lib/mauve/person.rb4
1 files 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