svnno****@sourc*****
svnno****@sourc*****
2008年 7月 16日 (水) 18:10:20 JST
SRADRevision: 701
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=701
Author: tach
Date: 2008-07-16 18:10:20 +0900 (Wed, 16 Jul 2008)
Log Message:
-----------
main rss fix continue
Modified Paths:
--------------
slashjp/branches/2.5.0.192/Slash/XML/RSS/RSS.pm
slashjp/branches/2.5.0.192/themes/slashcode/tasks/open_backend.pl
-------------- 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-07-16 04:31:26 UTC (rev 700)
+++ slashjp/branches/2.5.0.192/Slash/XML/RSS/RSS.pm 2008-07-16 09:10:20 UTC (rev 701)
@@ -285,8 +285,8 @@
if ($param->{textinput}) {
# set defaults
my %textinput = (
- title => 'Search ' . $constants->{sitename},
- description => 'Search ' . $constants->{sitename} . ' stories',
+ title => getData('search_header_title', {}, 'search'),
+ description => getData('search_header_descr', { section => $param->{skin} ? $param->{skin}{title} : undef }, 'search'),
name => 'query',
'link' => $channel{'link'} . 'search.pl',
);
Modified: slashjp/branches/2.5.0.192/themes/slashcode/tasks/open_backend.pl
===================================================================
--- slashjp/branches/2.5.0.192/themes/slashcode/tasks/open_backend.pl 2008-07-16 04:31:26 UTC (rev 700)
+++ slashjp/branches/2.5.0.192/themes/slashcode/tasks/open_backend.pl 2008-07-16 09:10:20 UTC (rev 701)
@@ -65,6 +65,7 @@
my $skin = { };
$skin = $slashdb->getSkin($name) if $name;
my $link = ($skin->{url} || $gSkin->{absolutedir}) . '/';
+ $link =~ s!/+$!/!;
my $title = $constants->{sitename};
$title = "$title: $skin->{title}"
if $skin->{skid} && $skin->{title};
@@ -119,6 +120,7 @@
version => $version,
textinput => 1,
image => 1,
+ skin => $skin,
items => \@items,
}, 1);