Committer: ailyin
LJSUP-6534 (Comments of suspended accounts that were purged are becoming visible):- fix code that switched the worker to work on the next cluster
- fix a variable name typo
- fix operator precedence in mysql <5.0
U trunk/cgi-bin/LJ/UserManage.pm U trunk/cgi-bin/LJ/Worker/UserManage/UserClusterCommentPurge.pm
Modified: trunk/cgi-bin/LJ/UserManage.pm =================================================================== --- trunk/cgi-bin/LJ/UserManage.pm 2010-09-20 11:42:04 UTC (rev 9518) +++ trunk/cgi-bin/LJ/UserManage.pm 2010-09-21 02:51:40 UTC (rev 9519) @@ -355,14 +355,14 @@ sub _exclude_protected_journals_clause { - my @protected_jorunals_ids; + my @protected_journals_ids; foreach my $journal (keys %LJ::JOURNALS_WITH_PROTECTED_CONTENT) { my $journalu = LJ::load_user($journal); next unless $journalu; - push @protected_jorunals_ids, $journalu->{'userid'}; + push @protected_journals_ids, $journalu->{'userid'}; } - return (@protected_jorunals_ids) - ? 'AND NOT journalid IN (' . join(', ', @protected_jorunals_ids) . ')' + return (@protected_journals_ids) + ? 'AND journalid NOT IN (' . join(', ', @protected_journals_ids) . ')' : ''; } Modified: trunk/cgi-bin/LJ/Worker/UserManage/UserClusterCommentPurge.pm =================================================================== --- trunk/cgi-bin/LJ/Worker/UserManage/UserClusterCommentPurge.pm 2010-09-20 11:42:04 UTC (rev 9518) +++ trunk/cgi-bin/LJ/Worker/UserManage/UserClusterCommentPurge.pm 2010-09-21 02:51:40 UTC (rev 9519) @@ -18,12 +18,13 @@ } sub next_cluster { - my $class = shift; - my $job = shift; - my $args = shift; + my ($class, $job, $args) = @_; my $clust = shift @{$args->{clusters}}; + return $class->finished($job, $args->{callback}) unless $clust; + + $args->{clust} = $clust; return $class->spawn($job, $args); }