Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17531
Modified Files:
rss.php
Log Message:
fix empty $entries array errors
Index: rss.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/rss.php,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- rss.php 9 Dec 2004 10:07:47 -0000 1.36
+++ rss.php 20 Dec 2004 13:48:29 -0000 1.37
@@ -79,12 +79,13 @@
}
if (!empty($serendipity['GET']['category'])) {
- $category = split("_", $serendipity['GET']['category'], 2);
- $category = $category[1];
- $title = serendipity_utf8_encode(htmlspecialchars("$category - $title"));
+ $category = split('_', $serendipity['GET']['category'], 2);
+ $category = $category[1];
+ $title = serendipity_utf8_encode(htmlspecialchars("$category - $title"));
} else {
- $title = serendipity_utf8_encode(htmlspecialchars("$title"));
+ $title = serendipity_utf8_encode(htmlspecialchars($title));
}
+
$description = serendipity_utf8_encode(htmlspecialchars($description));
$fullFeed = false;
@@ -130,9 +131,12 @@
foreach($entries AS $entry) {
$rdf_seq_li .= ' <rdf:li resource="' . serendipity_rss_getguid($entry, $comments) . '" />' . "\n";
}
+
+ $eventData = array_merge(array('display_dat' => ''), $entries);
+ serendipity_plugin_api::hook_event('frontend_display:rss-1.0:namespace', $eventData);
+ } else {
+ $eventData = array();
}
- $eventData = array_merge(array('display_dat' => ''), $entries);
- serendipity_plugin_api::hook_event('frontend_display:rss-1.0:namespace', $eventData);
print <<<HEAD
<rdf:RDF {$eventData['display_dat']}
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
@@ -161,8 +165,12 @@
break;
case '2.0':
- $eventData = array_merge(array('display_dat' => ''), $entries);
- serendipity_plugin_api::hook_event('frontend_display:rss-2.0:namespace', $eventData);
+ if (is_array($entries)) {
+ $eventData = array_merge(array('display_dat' => ''), $entries);
+ serendipity_plugin_api::hook_event('frontend_display:rss-2.0:namespace', $eventData);
+ } else {
+ $eventData = array();
+ }
print <<<HEAD
<rss version="2.0"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
@@ -186,7 +194,11 @@
break;
case 'atom0.3':
- $modified = gmdate('Y-m-d\TH:i:s\Z', serendipity_serverOffsetHour($entries[0]['last_modified']));
+ if (is_array($entries)) {
+ $modified = gmdate('Y-m-d\TH:i:s\Z', serendipity_serverOffsetHour($entries[0]['last_modified']));
+ } else {
+ $modified = gmdate('Y-m-d\TH:i:s\Z', serendipity_serverOffsetHour());
+ }
print <<<HEAD
<feed version="0.3"
xmlns="http://purl.org/atom/ns#"
@@ -213,7 +225,11 @@
break;
case 'opml1.0':
- $modified = gmdate('Y-m-d\TH:i:s\Z', serendipity_serverOffsetHour($entries[0]['last_modified']));
+ if (is_array($entries)) {
+ $modified = gmdate('Y-m-d\TH:i:s\Z', serendipity_serverOffsetHour($entries[0]['last_modified']));
+ } else {
+ $modified = gmdate('Y-m-d\TH:i:s\Z', serendipity_serverOffsetHour());
+ }
print <<<HEAD
<opml version="{$version}">
<head>
@@ -238,9 +254,11 @@
print "</rss>\n";
break;
case '1.0':
- $eventData = array_merge(array('display_dat' => ''), $entries);
- serendipity_plugin_api::hook_event('frontend_display:rss-1.0:once', $eventData);
- echo $eventData['display_dat'];
+ if (is_array($entries)) {
+ $eventData = array_merge(array('display_dat' => ''), $entries);
+ serendipity_plugin_api::hook_event('frontend_display:rss-1.0:once', $eventData);
+ echo $eventData['display_dat'];
+ }
print '</rdf:RDF>';
break;
case 'atom0.3':
|
