Tatsuki SUGIURA
sugi****@users*****
2006年 7月 13日 (木) 10:12:27 JST
Index: slashjp/plugins/Journal/journal.pl diff -u slashjp/plugins/Journal/journal.pl:1.12 slashjp/plugins/Journal/journal.pl:1.13 --- slashjp/plugins/Journal/journal.pl:1.12 Wed Jul 12 21:24:22 2006 +++ slashjp/plugins/Journal/journal.pl Thu Jul 13 10:12:27 2006 @@ -2,7 +2,7 @@ # This code is a part of Slash, and is released under the GPL. # Copyright 1997-2005 by Open Source Technology Group. See README # and COPYING for more information, or see http://slashcode.com/. -# $Id: journal.pl,v 1.12 2006/07/12 12:24:22 sugi Exp $ +# $Id: journal.pl,v 1.13 2006/07/13 01:12:27 sugi Exp $ use strict; use Slash 2.003; # require Slash 2.3.x @@ -13,7 +13,7 @@ use Slash::XML; use vars qw($VERSION); -($VERSION) = ' $Revision: 1.12 $ ' =~ /\$Revision:\s+([^\s]+)/; +($VERSION) = ' $Revision: 1.13 $ ' =~ /\$Revision:\s+([^\s]+)/; sub main { my $journal = getObject('Slash::Journal'); @@ -243,7 +243,7 @@ tid => $article->[5], }, title => $article->[2], - description => balanceTags(strip_mode($article->[1], $article->[4]), { deep_nesting => 1 }), + description => strip_notags($article->[1]), 'link' => root2abs() . '/~' . fixparam($nickname) . "/journal/$article->[3]", }; } @@ -258,21 +258,21 @@ ($constants->{journal_rdfitemdesc_html} > 2 && !$user->{is_anon}) ); - my($title, $journals, $link); + my($title, $desc, $link); if ($form->{op} && $form->{op} eq 'friendview') { - $title = "$juser->{nickname}'s Friends'"; - $journals = 'Journals'; + $title = getData('rss_fv_title', { nickname => $juser->{nickname} }); + $desc = getData('rss_fv_desc', { nickname => $juser->{nickname} }); $link = '/journal/friends/'; } else { - $title = "$juser->{nickname}'s"; - $journals = 'Journal'; + $title = getData('rss_title', { nickname => $juser->{nickname} }); + $des = getData('rss_desc', { nickname => $juser->{nickname} }); $link = '/journal/'; } xmlDisplay($form->{content_type} => { channel => { - title => "$title $journals", - description => "$title $constants->{sitename} $journals", + title => $title, + description => $desc, 'link' => root2abs() . '/~' . fixparam($juser->{nickname}) . $link, }, image => 1, @@ -518,7 +518,7 @@ } push @sorted_articles, $collection; - my $theme = _checkTheme($journal_reader->getUser($uid, 'journal_theme')); + my $theme = _checkTheme($form->{theme} || $journal_reader->getUser($uid, 'journal_theme')); my $show_discussion = $form->{id} && !$constants->{journal_no_comments_item} && $discussion; my $zoo = getObject('Slash::Zoo');
SRAD