svnno****@sourc*****
svnno****@sourc*****
2008年 4月 16日 (水) 17:56:52 JST
SRADRevision: 585
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=585
Author: tach
Date: 2008-04-16 17:56:52 +0900 (Wed, 16 Apr 2008)
Log Message:
-----------
merged from trunk to branches/2.5.0.192
* Fix: comment count fail when user hardthresh setting is enabled
Modified Paths:
--------------
slashjp/branches/2.5.0.192/Slash/DB/MySQL/MySQL.pm
slashjp/branches/2.5.0.192/debian/changelog
-------------- next part --------------
Modified: slashjp/branches/2.5.0.192/Slash/DB/MySQL/MySQL.pm
===================================================================
--- slashjp/branches/2.5.0.192/Slash/DB/MySQL/MySQL.pm 2008-04-16 08:27:36 UTC (rev 584)
+++ slashjp/branches/2.5.0.192/Slash/DB/MySQL/MySQL.pm 2008-04-16 08:56:52 UTC (rev 585)
@@ -6105,7 +6105,7 @@
if ($cid && $one_cid_only) {
$where .= "AND cid=$cid";
- } elsif ($user->{hardthresh} && !$options->{discussion2}) {
+ } elsif (0 && $user->{hardthresh} && !$options->{discussion2}) {
my $threshold_q = $self->sqlQuote($user->{threshold});
$where .= "AND (comments.points >= $threshold_q";
$where .= " OR comments.uid=$user->{uid}" unless $user->{is_anon};
Modified: slashjp/branches/2.5.0.192/debian/changelog
===================================================================
--- slashjp/branches/2.5.0.192/debian/changelog 2008-04-16 08:27:36 UTC (rev 584)
+++ slashjp/branches/2.5.0.192/debian/changelog 2008-04-16 08:56:52 UTC (rev 585)
@@ -6,8 +6,9 @@
/var/lib/slash/site/slashdot.jp/tasks/zoo_run_people_log.pl
* Allow to show AC info for admin user
* Fix: user karma_bonus settings are vanished...
+ * Fix: comment count fail when user hardthresh setting is enabled
- -- Taku YASUI <tach****@osdn*****> Wed, 16 Apr 2008 07:32:44 +0000
+ -- Taku YASUI <tach****@osdn*****> Wed, 16 Apr 2008 08:25:38 +0000
slash (2.5.0.192-8) unstable; urgency=low