svnno****@sourc*****
svnno****@sourc*****
2009年 4月 1日 (水) 22:37:27 JST
SRADRevision: 1093
http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=1093
Author: tach
Date: 2009-04-01 22:37:27 +0900 (Wed, 01 Apr 2009)
Log Message:
-----------
* Delete feature use shtml file instead of article.pl
* reduce changing line from upstream
Modified Paths:
--------------
slashjp/trunk/Slash/XML/RSS/RSS.pm
-------------- next part --------------
Modified: slashjp/trunk/Slash/XML/RSS/RSS.pm
===================================================================
--- slashjp/trunk/Slash/XML/RSS/RSS.pm 2009-03-31 15:12:56 UTC (rev 1092)
+++ slashjp/trunk/Slash/XML/RSS/RSS.pm 2009-04-01 13:37:27 UTC (rev 1093)
@@ -425,21 +425,18 @@
if $story->{title};
if ($story->{sid}) {
my $edit = "admin.pl?op=edit&sid=$story->{sid}";
- $action = "article.pl?sid=$story->{sid}";
- if (!$constants->{rss_no_tracking_query}) {
- $action .= "&from=rss";
- }
+ $action = "article.pl?sid=$story->{sid}&from=rss";
+ $action =~ s/&from=rss$// if ($constants->{rss_no_tracking_query});
if ($story->{primaryskid}) {
my $dir = url2abs(
$reader->getSkin($story->{primaryskid})->{rootdir},
$channel->{'link'}
);
- $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}");
+ $encoded_item->{'link'} = _tag_link("$dir/article.pl?sid=$story->{sid}");
$edit = "$dir/$edit";
$action = "$dir/$action";
} else {
- $encoded_item->{'link'} = $constants->{rss_use_story_shtml} ? _tag_link("$channel->{'link'}$story->{sid}.shtml") : _tag_link("$channel->{'link'}article.pl?sid=$story->{sid}");
+ $encoded_item->{'link'} = _tag_link("$channel->{'link'}article.pl?sid=$story->{sid}");
$edit = "$channel->{'link'}$edit";
$action = "$channel->{'link'}$action";
}