[Bps-public-commit] RT-Extension-MergeUsers branch, master, updated. 0.05-1-ge9b9dbd

[Thomas Sibley]

The branch, master has been updated
       via  e9b9dbd57e897c4e128b331bd22a38e663b2d17e (commit)
      from  d6803db049d37cf1766d341d714350325d424dbd (commit)

Summary of changes:
 lib/RT/Extension/MergeUsers.pm |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

- Log -----------------------------------------------------------------
commit e9b9dbd57e897c4e128b331bd22a38e663b2d17e
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Mon Oct 17 14:23:01 2011 -0400

    Actually clear the seen_users cache when we get undef back from SUPER::Next
    
    Otherwise you can't run through a collection more than once.

diff --git a/lib/RT/Extension/MergeUsers.pm b/lib/RT/Extension/MergeUsers.pm
index 5eedeab..030be04 100644
--- a/lib/RT/Extension/MergeUsers.pm
+++ b/lib/RT/Extension/MergeUsers.pm
@@ -329,8 +329,7 @@ sub Next {
     my $self = shift;
     
     my $user = $self->SUPER::Next(@_);
-    return unless ($user && $user->id);
-    unless ($user) {
+    unless ($user and $user->id) {
         $self->{seen_users} = undef;
         return undef;
     }   

-----------------------------------------------------------------------