svnno****@sourc*****
svnno****@sourc*****
2008年 7月 10日 (木) 13:08:45 JST
SRADRevision: 694
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=694
Author: tach
Date: 2008-07-10 13:08:45 +0900 (Thu, 10 Jul 2008)
Log Message:
-----------
* Add new journal top rss url: "/journals/top/rss" and
"/journals/top/recent/rss"
Modified Paths:
--------------
slashjp/branches/2.5.0.192/Slash/Apache/User/User.pm
slashjp/branches/2.5.0.192/debian/changelog
slashjp/branches/2.5.0.192/plugins/Journal/journal.pl
-------------- next part --------------
Modified: slashjp/branches/2.5.0.192/Slash/Apache/User/User.pm
===================================================================
--- slashjp/branches/2.5.0.192/Slash/Apache/User/User.pm 2008-07-09 17:00:52 UTC (rev 693)
+++ slashjp/branches/2.5.0.192/Slash/Apache/User/User.pm 2008-07-10 04:08:45 UTC (rev 694)
@@ -597,6 +597,10 @@
my($word, $query) = ($1, $2);
my @args = ($query);
$word =~ s{/}{_}g;
+ if ($word =~ /^(.+)_rss$/) {
+ $word = $1;
+ push @args, "content_type=rss";
+ }
push @args, "op=$word" if ($word);
$r->args(join('&', @args));
$r->uri('/journal.pl');
Modified: slashjp/branches/2.5.0.192/debian/changelog
===================================================================
--- slashjp/branches/2.5.0.192/debian/changelog 2008-07-09 17:00:52 UTC (rev 693)
+++ slashjp/branches/2.5.0.192/debian/changelog 2008-07-10 04:08:45 UTC (rev 694)
@@ -8,8 +8,10 @@
section local
* Change journal top rss including html description and change URL adding
journal id
+ * Add new journal top rss url: "/journals/top/rss" and
+ "/journals/top/recent/rss"
- -- Taku YASUI <tach****@osdn*****> Wed, 9 Jul 2008 16:42:42 +0000
+ -- Taku YASUI <tach****@osdn*****> Thu, 10 Jul 2008 04:07:53 +0000
slash (2.5.0.192-15) unstable; urgency=low
Modified: slashjp/branches/2.5.0.192/plugins/Journal/journal.pl
===================================================================
--- slashjp/branches/2.5.0.192/plugins/Journal/journal.pl 2008-07-09 17:00:52 UTC (rev 693)
+++ slashjp/branches/2.5.0.192/plugins/Journal/journal.pl 2008-07-10 04:08:45 UTC (rev 694)
@@ -100,7 +100,7 @@
# hijack feeds
if ($form->{content_type} && $form->{content_type} =~ $constants->{feed_types}) {
- if ($op eq 'top' && $top_ok) {
+ if ($op =~ /^top/ && $top_ok) {
displayTopRSS($journal, $constants, $user, $form, $journal_reader, $gSkin);
} else {
displayRSS($journal, $constants, $user, $form, $journal_reader, $gSkin);