Committer: vsukhanov
LJSUP-8339: lazy-cleanup worker is brockenU trunk/cgi-bin/LJ/Console/Command/Entry.pm U trunk/cgi-bin/ljprotocol.pl
Modified: trunk/cgi-bin/LJ/Console/Command/Entry.pm =================================================================== --- trunk/cgi-bin/LJ/Console/Command/Entry.pm 2011-03-24 03:46:49 UTC (rev 18692) +++ trunk/cgi-bin/LJ/Console/Command/Entry.pm 2011-03-24 05:34:53 UTC (rev 18693) @@ -38,7 +38,7 @@ unless $entry && $entry->valid; if ($action eq "delete") { - LJ::delete_entry($entry->journal, $entry->jitemid) + LJ::delete_entry($entry->journal, $entry->jitemid, undef, $entry->anum) or return $self->error("There was a problem deleting this entry."); } Modified: trunk/cgi-bin/ljprotocol.pl =================================================================== --- trunk/cgi-bin/ljprotocol.pl 2011-03-24 03:46:49 UTC (rev 18692) +++ trunk/cgi-bin/ljprotocol.pl 2011-03-24 05:34:53 UTC (rev 18693) @@ -2015,7 +2015,7 @@ LJ::text_compress($event)); if ($uowner->err) { my $msg = $uowner->errstr; - LJ::delete_entry($uowner, $jitemid); # roll-back + LJ::delete_entry($uowner, $jitemid, undef, $anum); # roll-back return fail($err,501,"logtext:$msg"); } LJ::MemCache::set([$ownerid,"logtext:$clusterid:$ownerid:$jitemid"], @@ -2027,7 +2027,7 @@ "VALUES ($ownerid, $jitemid, $qallowmask)"); if ($uowner->err) { my $msg = $uowner->errstr; - LJ::delete_entry($uowner, $jitemid); # roll-back + LJ::delete_entry($uowner, $jitemid, undef, $anum); # roll-back return fail($err,501,"logsec2:$msg"); } }