aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2009-12-17 01:06:01 +0000
committerAndreas Fischer <bantu@phpbb.com>2009-12-17 01:06:01 +0000
commit9d436a33f655c2ddbbed96b9cf6ac7f39c884390 (patch)
treecdfb2a5b901f0a6cf7e5515214f0bb3e677dc1b6
parent437c66e8c818becb7a04c5b224f6c060aa55459e (diff)
downloadforums-9d436a33f655c2ddbbed96b9cf6ac7f39c884390.tar
forums-9d436a33f655c2ddbbed96b9cf6ac7f39c884390.tar.gz
forums-9d436a33f655c2ddbbed96b9cf6ac7f39c884390.tar.bz2
forums-9d436a33f655c2ddbbed96b9cf6ac7f39c884390.tar.xz
forums-9d436a33f655c2ddbbed96b9cf6ac7f39c884390.zip
Some corrections for r10347 and r10345.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10348 89ea8834-ac86-4346-8a33-228a782c2dd0
-rw-r--r--phpBB/feed.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/feed.php b/phpBB/feed.php
index a5ffbf3412..8b241176b8 100644
--- a/phpBB/feed.php
+++ b/phpBB/feed.php
@@ -188,7 +188,7 @@ foreach ($item_vars as $row)
echo '<link href="' . $row['link'] . '"/>' . "\n";
echo '<title type="html"><![CDATA[' . $row['title'] . ']]></title>' . "\n\n";
- if (!empty($row['category']) && isset($row['category_name']))
+ if (!empty($row['category']) && isset($row['category_name']) && $row['category_name'] !== '')
{
echo '<category term="' . $row['category_name'] . '" scheme="' . $row['category'] . '" label="' . $row['category_name'] . '"/>' . "\n";
}
@@ -1161,7 +1161,7 @@ class phpbb_feed_topics extends phpbb_feed_base
{
global $user;
- $item_row['statistics'] = $user->lang['POSTED'] . ' ' . $user->lang['POST_BY_AUTHOR'] . ' ' . $this->user_viewprofile($row)
+ $item_row['statistics'] = $user->lang['POSTED'] . ' ' . $user->lang['POST_BY_AUTHOR'] . ' ' . $this->user_viewprofile($row)
. ' ' . $this->separator_stats . ' ' . $user->format_date($row['topic_time'])
. ' ' . $this->separator_stats . ' ' . $user->lang['REPLIES'] . ' ' . $row['topic_replies']
. ' ' . $this->separator_stats . ' ' . $user->lang['VIEWS'] . ' ' . $row['topic_views'];