fix when authenticated as someone else

sferik · Dec 20, 2012 · d97438f · d97438f
1 parent 1330431
commit d97438f
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/twitter/api/friends_and_followers.rb b/lib/twitter/api/friends_and_followers.rb
@@ -326,7 +326,7 @@ def friends(*args)
       def friends_or_followers_from_response(request_method, path, args)
         options = extract_options!(args)
         merge_default_cursor!(options)
-        merge_user!(options, args.pop || screen_name)
+        merge_user!(options, args.pop || screen_name) if options[:screen_name].nil? and options[:user_id].nil?
         cursor_from_response(:users, Twitter::User, request_method, path, options, calling_method)
       end