svnno****@sourc*****
svnno****@sourc*****
2008年 12月 9日 (火) 15:16:18 JST
スラドRevision: 869
http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=869
Author: tach
Date: 2008-12-09 15:16:17 +0900 (Tue, 09 Dec 2008)
Log Message:
-----------
Add selectable d2 default using constants "d2_default"
Modified Paths:
--------------
slashjp/trunk/Slash/Utility/Environment/Environment.pm
slashjp/trunk/debian/changelog
slashjp/trunk/sql/mysql/defaults.sql
-------------- next part --------------
Modified: slashjp/trunk/Slash/Utility/Environment/Environment.pm
===================================================================
--- slashjp/trunk/Slash/Utility/Environment/Environment.pm 2008-12-05 05:52:25 UTC (rev 868)
+++ slashjp/trunk/Slash/Utility/Environment/Environment.pm 2008-12-09 06:16:17 UTC (rev 869)
@@ -1580,7 +1580,7 @@
# no_d2 is set, or they are IE users
$user->{state}{no_d2} = $form->{no_d2} ? 1 : 0;
if (!$user->{discussion2}) {
- my $d2 = 'slashdot'; # default for all users
+ my $d2 = $constants->{d2_default} || 'slashdot'; # default for all users
if ($user->{state}{no_d2}) {
$d2 = 'none';
} elsif ($ENV{GATEWAY_INTERFACE}) {
Modified: slashjp/trunk/debian/changelog
===================================================================
--- slashjp/trunk/debian/changelog 2008-12-05 05:52:25 UTC (rev 868)
+++ slashjp/trunk/debian/changelog 2008-12-09 06:16:17 UTC (rev 869)
@@ -1,8 +1,9 @@
slash (2.5.0.233-1) unstable; urgency=low
* New upstream git tag
+ * Add selectable d2 default using constants "d2_default"
- -- Taku YASUI <tach****@osdn*****> Fri, 05 Dec 2008 14:51:48 +0900
+ -- Taku YASUI <tach****@osdn*****> Tue, 09 Dec 2008 15:15:52 +0900
slash (2.5.0.231-1) unstable; urgency=low
Modified: slashjp/trunk/sql/mysql/defaults.sql
===================================================================
--- slashjp/trunk/sql/mysql/defaults.sql 2008-12-05 05:52:25 UTC (rev 868)
+++ slashjp/trunk/sql/mysql/defaults.sql 2008-12-09 06:16:17 UTC (rev 869)
@@ -1162,6 +1162,7 @@
INSERT IGNORE INTO vars (name, value, description) VALUES ('search_query_name','query','alternative query string form name for search.pl');
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');
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';