svnno****@sourc*****
svnno****@sourc*****
2007年 12月 17日 (月) 18:59:14 JST
SRADRevision: 288
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=288
Author: tach
Date: 2007-12-17 18:59:13 +0900 (Mon, 17 Dec 2007)
Log Message:
-----------
Add: select enabling discussion2 or not with constants 'no_d2'
Modified Paths:
--------------
slashjp/trunk/Slash/Slash.pm
slashjp/trunk/debian/changelog
slashjp/trunk/sql/mysql/defaults.sql
-------------- next part --------------
Modified: slashjp/trunk/Slash/Slash.pm
===================================================================
--- slashjp/trunk/Slash/Slash.pm 2007-12-17 08:26:28 UTC (rev 287)
+++ slashjp/trunk/Slash/Slash.pm 2007-12-17 09:59:13 UTC (rev 288)
@@ -2257,6 +2257,9 @@
# is discussion2 active?
sub discussion2 {
my $user = $_[0] || getCurrentUser();
+ if (getCurrentStatic('no_d2')) {
+ return 0;
+ }
if ($user->{discussion2}) {
return $user->{discussion2} =~ /^(?:slashdot|uofm)$/
? $user->{discussion2} : 0;
Modified: slashjp/trunk/debian/changelog
===================================================================
--- slashjp/trunk/debian/changelog 2007-12-17 08:26:28 UTC (rev 287)
+++ slashjp/trunk/debian/changelog 2007-12-17 09:59:13 UTC (rev 288)
@@ -11,9 +11,10 @@
* Add: takeover_discussion_from_firehose constants
to takeover discussions before approve.
* Add: select adding '?from=rss' phrase to rss link
- using constants 'rss_no_tracking_query'.
+ with constants 'rss_no_tracking_query'
+ * Add: select enabling discussion2 or not with constants 'no_d2'
- -- Taku YASUI <tach****@osdn*****> Mon, 17 Dec 2007 17:20:25 +0900
+ -- Taku YASUI <tach****@osdn*****> Mon, 17 Dec 2007 17:54:08 +0900
slash (2.5.0.184-1) unstable; urgency=low
Modified: slashjp/trunk/sql/mysql/defaults.sql
===================================================================
--- slashjp/trunk/sql/mysql/defaults.sql 2007-12-17 08:26:28 UTC (rev 287)
+++ slashjp/trunk/sql/mysql/defaults.sql 2007-12-17 09:59:13 UTC (rev 288)
@@ -1135,6 +1135,7 @@
INSERT IGNORE INTO vars (name, value, description) VALUES ('today','Today','string of "Today" for translation');
INSERT IGNORE INTO vars (name, value, description) VALUES ('yesterday','Yesterday','string of "Yesterday" for translation');
INSERT IGNORE INTO vars (name, value, description) VALUES ('rss_no_tracking_query','0','When "1", the code does not add rss tracking code like "?from=rss".');
+INSERT IGNORE INTO vars (name, value, description) VALUES ('no_d2','0','When "1", disable using discussion2.');
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';