makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Automatically lookup num_items in the config array if it is a string.

Browse source 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10359 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Andreas Fischer 2009-12-20 19:46:48 +00:00
parent d7e8e4d9cb
commit 64898803af
1 changed files with 18 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
phpBB/feed.php
View file

@ -432,7 +432,21 @@ class phpbb_feed_base
*/
function phpbb_feed_base()
{
global $config;
$this->set_keys();
// Allow num_items to be string
if (is_string($this->num_items))
{
$this->num_items = (int) $config[$this->num_items];
// A precaution
if (!$this->num_items)
{
$this->num_items = 10;
}
}
}
/**
@ -592,10 +606,10 @@ class phpbb_feed_base
*/
class phpbb_feed_post_base extends phpbb_feed_base
{
var $num_items = 'feed_limit';
function set_keys()
{
global $config;
$this->set('title', 'post_subject');
$this->set('title2', 'topic_title');
@ -610,8 +624,6 @@ class phpbb_feed_post_base extends phpbb_feed_base
$this->set('enable_bbcode', 'enable_bbcode');
$this->set('enable_smilies', 'enable_smilies');
$this->set('enable_magic_url', 'enable_magic_url');
$this->num_items = (int) $config['feed_limit'];
}
function adjust_item(&$item_row, &$row)
@ -1098,14 +1110,7 @@ class phpbb_feed_forums extends phpbb_feed_base
*/
class phpbb_feed_news extends phpbb_feed_topic_base
{
function set_keys()
{
global $config;
parent::set_keys();
$this->num_items = (int) $config['feed_limit'];
}
var $num_items = 'feed_limit';
function get_news_forums()
{
@ -1188,14 +1193,7 @@ class phpbb_feed_news extends phpbb_feed_topic_base
*/
class phpbb_feed_topics extends phpbb_feed_topic_base
{
function set_keys()
{
global $config;
parent::set_keys();
$this->num_items = (int) $config['feed_overall_topics_limit'];
}
var $num_items = 'feed_overall_topics_limit';
function get_sql()
{