aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/feed.php
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2010-03-02 01:05:41 +0100
committerNils Adermann <naderman@naderman.de>2010-03-02 01:05:41 +0100
commit6ebc26e330d5e204eab0ac9061bb5817534047fe (patch)
tree417aa508a0b4282ec0ae1834ea02032e7e033d5f /phpBB/feed.php
parentf0eb18fffd11a97383c8ccf2ae7d2838939f09e2 (diff)
parent8d12b40fc4fdf50517e9584d14a5edd311953e7c (diff)
downloadforums-6ebc26e330d5e204eab0ac9061bb5817534047fe.tar
forums-6ebc26e330d5e204eab0ac9061bb5817534047fe.tar.gz
forums-6ebc26e330d5e204eab0ac9061bb5817534047fe.tar.bz2
forums-6ebc26e330d5e204eab0ac9061bb5817534047fe.tar.xz
forums-6ebc26e330d5e204eab0ac9061bb5817534047fe.zip
Merge commit 'release-3.0.6-RC3'
Diffstat (limited to 'phpBB/feed.php')
-rw-r--r--phpBB/feed.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/feed.php b/phpBB/feed.php
index 9603b27301..88539acbf1 100644
--- a/phpBB/feed.php
+++ b/phpBB/feed.php
@@ -196,7 +196,7 @@ foreach ($item_vars as $row)
echo '<p>' . $user->lang['STATISTICS'] . ': ' . $row['statistics'] . '</p>';
}
- echo '<hr /></div>' . "\n" . ']]></content>' . "\n";
+ echo '<hr />' . "\n" . ']]></content>' . "\n";
echo '</entry>' . "\n";
}
@@ -249,7 +249,7 @@ function feed_generate_content($content, $uid, $bitfield, $options)
$content = str_replace('./', $board_url . '/', $content);
// Remove "Select all" link and mouse events
- $content = str_replace('<a href="#" onclick="selectCode(this); return false;">' .$user->lang['SELECT_ALL_CODE'] . '</a>', '', $content);
+ $content = str_replace('<a href="#" onclick="selectCode(this); return false;">' . $user->lang['SELECT_ALL_CODE'] . '</a>', '', $content);
$content = preg_replace('#(onkeypress|onclick)="(.*?)"#si', '', $content);
// Firefox does not support CSS for feeds, though
@@ -450,7 +450,7 @@ class phpbb_feed
$this->sql = array();
// Set some values for pagination
- $this->num_items = $config['feed_limit'];
+ $this->num_items = (int) $config['feed_limit'];
$this->set_keys();
}
@@ -828,7 +828,7 @@ class phpbb_feed_forums extends phpbb_feed
$this->set('date', 'forum_last_post_time');
$this->set('options', 'forum_desc_options');
- $this->num_items = $config['feed_overall_forums_limit'];
+ $this->num_items = (int) $config['feed_overall_forums_limit'];
}
function open()