svnno****@sourc*****
svnno****@sourc*****
2008年 3月 12日 (水) 15:32:28 JST
SRADRevision: 548
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=548
Author: tach
Date: 2008-03-12 15:32:27 +0900 (Wed, 12 Mar 2008)
Log Message:
-----------
merged from 2.5.0.192 branch
Modified Paths:
--------------
slashjp/trunk/Slash/XML/RSS/RSS.pm
slashjp/trunk/debian/slash-backend.logcheck.ignore.server
slashjp/trunk/sql/mysql/defaults.sql
slashjp/trunk/themes/slashcode/htdocs/users.pl
-------------- next part --------------
Modified: slashjp/trunk/Slash/XML/RSS/RSS.pm
===================================================================
--- slashjp/trunk/Slash/XML/RSS/RSS.pm 2008-03-12 05:59:21 UTC (rev 547)
+++ slashjp/trunk/Slash/XML/RSS/RSS.pm 2008-03-12 06:32:27 UTC (rev 548)
@@ -425,11 +425,12 @@
$reader->getSkin($story->{primaryskid})->{rootdir},
$channel->{'link'}
);
- $encoded_item->{'link'} = _tag_link("$dir/article.pl?sid=$story->{sid}");
+ $dir .= "/articles" if ($constants->{rss_use_story_shtml} && $story->{primaryskid} == $constants->{mainpage_skid});
+ $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";
}
@@ -576,8 +577,7 @@
sub _tag_link {
my($link) = @_;
my $uri = URI->new($link);
- my $constants = getCurrentStatic();
- if (!$constants->{rss_no_tracking_query}) {
+ if (!getCurrentStatic('rss_no_tracking_query')) {
if (my $orig_query = $uri->query) {
$uri->query("$orig_query&from=rss");
} else {
Modified: slashjp/trunk/debian/slash-backend.logcheck.ignore.server
===================================================================
--- slashjp/trunk/debian/slash-backend.logcheck.ignore.server 2008-03-12 05:59:21 UTC (rev 547)
+++ slashjp/trunk/debian/slash-backend.logcheck.ignore.server 2008-03-12 06:32:27 UTC (rev 548)
@@ -23,6 +23,10 @@
\[p2f_hof_topics\.pl\] (hof|topics|authors)\.pl
\[reskey_purge\.pl\] Purged [0-9]+ reskeys
\[delete_accesslog\.pl\] deleted so far [0-9]+ of [0-9]+ rows
+\[fetch_rss_bookmarks\.pl\] Feed:
+\[fetch_rss_bookmarks\.pl\] [0-9A-Za-z ]+ [0-9]+
+\[fetch_rss_bookmarks\.pl\] [0-9]+ https?://
+\[fetch_rss_bookmarks\.pl\] after creating bookmark
\[firehose_get_thumbnails\.pl\] Last id: [0-9]+
\[firehose_backend\.pl\] gen firehose (firehose|firehose_nostories)
\[set_cids\.pl\] min_cid_last_
Modified: slashjp/trunk/sql/mysql/defaults.sql
===================================================================
--- slashjp/trunk/sql/mysql/defaults.sql 2008-03-12 05:59:21 UTC (rev 547)
+++ slashjp/trunk/sql/mysql/defaults.sql 2008-03-12 06:32:27 UTC (rev 548)
@@ -1140,6 +1140,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';
Modified: slashjp/trunk/themes/slashcode/htdocs/users.pl
===================================================================
--- slashjp/trunk/themes/slashcode/htdocs/users.pl 2008-03-12 05:59:21 UTC (rev 547)
+++ slashjp/trunk/themes/slashcode/htdocs/users.pl 2008-03-12 06:32:27 UTC (rev 548)
@@ -1781,7 +1781,7 @@
# Set up $nexus_hr, @nexustid_order, and $story023_default{nexus}.
my $topic_tree = $reader->getTopicTree();
- my $nexus_tids_ar = $reader->getStorypickableNexusChildren($constants->{mainpage_nexus_tid}, 1);
+ my $nexus_tids_ar = [ sort grep {$topic_tree->{$_}{storypickable}} $reader->getNexusTids() ];
my $nexus_hr = { };
for my $tid (@$nexus_tids_ar) {