git-svn-id: https://torrentpier2.googlecode.com/svn/trunk@159 a8ac35ab-4ca4-ca47-4c2d-a49a94f06293
This commit is contained in:
nanosimbiot 2011-07-26 19:21:11 +00:00
commit 0749e0de82
2 changed files with 9 additions and 5 deletions

View file

@ -144,10 +144,10 @@ if ($bb_cfg['show_latest_news'] AND $news_forum_ids = $bb_cfg['latest_news_forum
//
// Ads
//
$ad_html = $ad_block_assignment = array();
if ($bb_cfg['show_ads'])
{
$ad_html = $ad_block_assignment = array();
$active_ads = DB()->fetch_rowset("
SELECT *
FROM ". BB_ADS ."
@ -168,7 +168,6 @@ if ($bb_cfg['show_ads'])
$ad_html[$ad['ad_id']] = $ad['ad_html'];
}
$this->store('ads', $ad_html);
bb_update_config(array('active_ads' => serialize($ad_block_assignment)));
}
$this->store('ads', $ad_html);
bb_update_config(array('active_ads' => serialize($ad_block_assignment)));

View file

@ -533,6 +533,11 @@ $html = new html_common();
$log_action = new log_action();
$ads = new ads_common();
// !!! Temporarily (??) 'cat_forums' always enqueued
$datastore->enqueue(array(
'cat_forums',
));
// Cron
if ((empty($_POST) && !defined('IN_ADMIN') && !defined('IN_AJAX') && !defined('IN_SERVICE') && !file_exists(CRON_RUNNING) && ($bb_cfg['cron_enabled'] || defined('START_CRON'))) || defined('FORCE_CRON'))
{