svnno****@sourc*****
svnno****@sourc*****
2008年 3月 10日 (月) 15:41:08 JST
SRADRevision: 542
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=542
Author: tach
Date: 2008-03-10 15:41:08 +0900 (Mon, 10 Mar 2008)
Log Message:
-----------
Enable to select using shtml links at site RSS/RDF by $constants->{rss_use_story_shtml}
Modified Paths:
--------------
slashjp/branches/2.5.0.192/Slash/XML/RSS/RSS.pm
slashjp/branches/2.5.0.192/debian/changelog
slashjp/branches/2.5.0.192/sql/mysql/defaults.sql
-------------- next part --------------
Modified: slashjp/branches/2.5.0.192/Slash/XML/RSS/RSS.pm
===================================================================
--- slashjp/branches/2.5.0.192/Slash/XML/RSS/RSS.pm 2008-03-10 04:32:28 UTC (rev 541)
+++ slashjp/branches/2.5.0.192/Slash/XML/RSS/RSS.pm 2008-03-10 06:41:08 UTC (rev 542)
@@ -425,11 +425,11 @@
$reader->getSkin($story->{primaryskid})->{rootdir},
$channel->{'link'}
);
- $encoded_item->{'link'} = _tag_link("$dir/article.pl?sid=$story->{sid}");
+ $encoded_item->{'link'} = $constants->{rss_use_story_shtml} ? _tag_link("$dir/$story->{sid}.shtml") : _tag_link("$dir/article.pl?sid=$story->{sid}");
$edit = "$dir/$edit";
$action = "$dir/$action";
} else {
- $encoded_item->{'link'} = _tag_link("$channel->{'link'}article.pl?sid=$story->{sid}");
+ $encoded_item->{'link'} = $constants->{rss_use_story_shtml} ? _tag_link("$channel->{'link'}$story->{sid}.shtml") : _tag_link("$channel->{'link'}article.pl?sid=$story->{sid}");
$edit = "$channel->{'link'}$edit";
$action = "$channel->{'link'}$action";
}
Modified: slashjp/branches/2.5.0.192/debian/changelog
===================================================================
--- slashjp/branches/2.5.0.192/debian/changelog 2008-03-10 04:32:28 UTC (rev 541)
+++ slashjp/branches/2.5.0.192/debian/changelog 2008-03-10 06:41:08 UTC (rev 542)
@@ -1,3 +1,10 @@
+slash (2.5.0.192-8) unstable; urgency=low
+
+ * Enable to select using shtml links at site RSS/RDF by
+ $constants->{rss_use_story_shtml}
+
+ -- Taku YASUI <tach****@osdn*****> Mon, 10 Mar 2008 06:14:44 +0000
+
slash (2.5.0.192-7) unstable; urgency=low
* Add to forbid Moderation for user doing bad moderation
Modified: slashjp/branches/2.5.0.192/sql/mysql/defaults.sql
===================================================================
--- slashjp/branches/2.5.0.192/sql/mysql/defaults.sql 2008-03-10 04:32:28 UTC (rev 541)
+++ slashjp/branches/2.5.0.192/sql/mysql/defaults.sql 2008-03-10 06:41:08 UTC (rev 542)
@@ -1139,6 +1139,7 @@
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.');
INSERT IGNORE INTO vars (name, value, description) VALUES ('firehose_name','Firehose','The name of "Firehose" function');
+INSERT IGNORE INTO vars (name, value, description) VALUES ('rss_use_story_shtml','0','Use ${sid}.shtml for RSS/RDF link');
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';