svnno****@sourc*****
svnno****@sourc*****
2007年 12月 6日 (木) 22:04:43 JST
SRADRevision: 277
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=277
Author: tach
Date: 2007-12-06 22:04:42 +0900 (Thu, 06 Dec 2007)
Log Message:
-----------
Fix: cannot getSkin for empty skid='0' at firehose.pl
Modified Paths:
--------------
slashjp/trunk/debian/changelog
slashjp/trunk/plugins/FireHose/templates/dispFireHose;firehose;default
-------------- next part --------------
Modified: slashjp/trunk/debian/changelog
===================================================================
--- slashjp/trunk/debian/changelog 2007-12-06 12:06:24 UTC (rev 276)
+++ slashjp/trunk/debian/changelog 2007-12-06 13:04:42 UTC (rev 277)
@@ -5,8 +5,9 @@
refs" in use at /usr/share/perl5/Slash/Tags.pm line 1514.\n
* Fix: Use of uninitialized value in string comparison (cmp) at
/usr/share/perl5/Slash/Tags.pm line 1648.
+ * Fix: cannot getSkin for empty skid='0' at firehose.pl
- -- Taku YASUI <tach****@osdn*****> Thu, 06 Dec 2007 21:05:39 +0900
+ -- Taku YASUI <tach****@osdn*****> Thu, 06 Dec 2007 22:03:51 +0900
slash (2.5.0.184-1) unstable; urgency=low
Modified: slashjp/trunk/plugins/FireHose/templates/dispFireHose;firehose;default
===================================================================
--- slashjp/trunk/plugins/FireHose/templates/dispFireHose;firehose;default 2007-12-06 12:06:24 UTC (rev 276)
+++ slashjp/trunk/plugins/FireHose/templates/dispFireHose;firehose;default 2007-12-06 13:04:42 UTC (rev 277)
@@ -114,7 +114,7 @@
<ul>
<li class="more"><b>
[% IF item.type == "story" %]
- [% the_skin = Slash.db.getSkin(item.primaryskid) %]
+ [% the_skin = item.primaryskid ? Slash.db.getSkin(item.primaryskid) : Slash.db.getSkin(constants.mainpage_skid) %]
[%
readmore_link = "Read More";
@@ -142,7 +142,7 @@
disc = Slash.db.getDiscussion(item.discussion); %]
<li class="comments[% IF !disc.commentcount || options.nocommentcnt %] nocomment[% END %]">
[% skin = gSkin %]
- [% IF item.type == "story"; skin = Slash.db.getSkin(item.primaryskid); END %]
+ [% IF item.type == "story"; skin = item.primaryskid ? Slash.db.getSkin(item.primaryskid) : Slash.db.getSkin(constants.mainpage_skid); END %]
<a href="[% skin.rootdir %]/comments.pl?sid=[% item.discussion %]">[% disc.commentcount %]</a> <span>comment[% IF disc.commentcount != 1 %]s[% END %]</span>
</li>
[% END %]