svnno****@sourc*****
svnno****@sourc*****
2009年 1月 19日 (月) 18:56:16 JST
スラドRevision: 957
http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=957
Author: tach
Date: 2009-01-19 18:56:16 +0900 (Mon, 19 Jan 2009)
Log Message:
-----------
Fix FireHose item selection rule about "user:username" filter
Modified Paths:
--------------
slashjp/trunk/debian/changelog
slashjp/trunk/plugins/FireHose/FireHose.pm
slashjp/trunk/sql/mysql/defaults.sql
-------------- next part --------------
Modified: slashjp/trunk/debian/changelog
===================================================================
--- slashjp/trunk/debian/changelog 2009-01-19 06:40:02 UTC (rev 956)
+++ slashjp/trunk/debian/changelog 2009-01-19 09:56:16 UTC (rev 957)
@@ -5,8 +5,9 @@
* Add logcheck ignore rules
- TagModeration messages
- hc_maintain_pool messages
+ * Fix FireHose item selection rule about "user:username" filter
- -- Taku YASUI <tach****@osdn*****> Mon, 19 Jan 2009 06:39:14 +0000
+ -- Taku YASUI <tach****@osdn*****> Mon, 19 Jan 2009 09:55:25 +0000
slash (2.5.0.233-2) unstable; urgency=low
Modified: slashjp/trunk/plugins/FireHose/FireHose.pm
===================================================================
--- slashjp/trunk/plugins/FireHose/FireHose.pm 2009-01-19 06:40:02 UTC (rev 956)
+++ slashjp/trunk/plugins/FireHose/FireHose.pm 2009-01-19 09:56:16 UTC (rev 957)
@@ -2569,7 +2569,11 @@
$uid = $self->getUserUID($nick);
}
$uid ||= $user->{uid};
- $fh_options->{tagged_by_uid} = $uid;
+ if ($constants->{firehose_tagged_by_uid}) {
+ $fh_options->{tagged_by_uid} = $uid;
+ } else {
+ $fh_options->{uid} = $uid;
+ }
$fh_options->{tagged_non_negative} = 1;
# $fh_options->{ignore_nix} = 1;
} elsif (/^tag:/) {
Modified: slashjp/trunk/sql/mysql/defaults.sql
===================================================================
--- slashjp/trunk/sql/mysql/defaults.sql 2009-01-19 06:40:02 UTC (rev 956)
+++ slashjp/trunk/sql/mysql/defaults.sql 2009-01-19 09:56:16 UTC (rev 957)
@@ -1163,6 +1163,7 @@
INSERT IGNORE INTO vars (name, value, description) VALUES ('journal_list_default_display', '50', 'Number of journals to display on a journal title list page');
INSERT IGNORE INTO vars (name, value, description) VALUES ('mod_limit_not_m2able_reasons', '0', 'Enable moderation limit for not m2able reasons when it is not eligible');
INSERT IGNORE INTO vars (name, value, description) VALUES ('d2_default', '', 'Default discussion2 module name');
+INSERT IGNORE INTO vars (name, value, description) VALUES ('firehose_tagged_by_uid', '0', 'Use as tagged_by_uid instead of uid for FireHose filter "user:username"');
UPDATE vars SET value='text/html; charset=UTF-8' WHERE name='content_type_webpage';
UPDATE vars SET value='0' WHERE name='draconian_charset';
UPDATE vars SET value='UTF-8' WHERE name='rdfencoding';