svnno****@sourc*****
svnno****@sourc*****
2008年 7月 18日 (金) 12:12:03 JST
SRADRevision: 708
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=708
Author: tach
Date: 2008-07-18 12:12:03 +0900 (Fri, 18 Jul 2008)
Log Message:
-----------
Fix: use $constants instead of $gSkin when using slashd
Modified Paths:
--------------
slashjp/branches/2.5.0.192/plugins/PollBooth/pollBooth.pl
-------------- next part --------------
Modified: slashjp/branches/2.5.0.192/plugins/PollBooth/pollBooth.pl
===================================================================
--- slashjp/branches/2.5.0.192/plugins/PollBooth/pollBooth.pl 2008-07-18 03:11:18 UTC (rev 707)
+++ slashjp/branches/2.5.0.192/plugins/PollBooth/pollBooth.pl 2008-07-18 03:12:03 UTC (rev 708)
@@ -524,18 +524,14 @@
my $polls = getObject('Slash::PollBooth', { db_type => 'reader' });
my $offset = 0;
my $limit = 10;
- my $gSkin = getCurrentSkin();
- my $user = getCurrentUser();
my $columns = "*";
my $tables = "pollquestions";
my $where = "";
my $other = "ORDER BY date DESC LIMIT $offset, $limit";
-
my $questions = $polls->sqlSelectAllHashrefArray($columns, $tables, $where, $other);
my $items = [];
-
foreach my $entry (@$questions) {
my $poll = $polls->getPoll($entry->{qid});
my $pollbooth = getData('rss_pollbooth', { poll => $poll });
@@ -545,7 +541,7 @@
uid => $entry->{uid},
'time' => $entry->{date},
},
- 'link' => "$gSkin->{absolutedir}/polls/$entry->{qid}",
+ 'link' => "$constants->{absolutedir}/polls/$entry->{qid}",
title => $entry->{question},
'time' => $entry->{date},
description => $entry->{question} . $readmore,
@@ -553,21 +549,22 @@
});
}
- xmlDisplay($form->{content_type} => {
+ my $ret = xmlDisplay($form->{content_type} => {
channel => {
title => getData('rss_title'),
description => getData('rss_descr'),
- 'link' => "$gSkin->{absolutedir}/polls/",
+ 'link' => "$constants->{absolutedir}/polls/",
},
image => 1,
textinput => {
title => getData('search_header_title', { op => getData('polls', {}, 'search') }, 'search'),
- 'link' => "$gSkin->{absolutedir}/search.pl?op=polls",
+ 'link' => "$constants->{absolutedir}/search.pl?op=polls",
},
items => $items,
rdfitemdesc => $constants->{dfitemdesc},
rdfitemdesc_html => $constants->{dfitemdesc_html} || 1,
- });
+ }, $form->{ssi});
+ print "$ret\n" if ($form->{ssi});
}
#################################################################