diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2011-03-12 18:16:10 +0100 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2011-03-12 18:16:10 +0100 |
| commit | a27a39ebed0133dd88322a2c3a9e7228c657a703 (patch) | |
| tree | 4fb44ffea4833d136e5c8de2a85ffe793df71233 | |
| parent | df096b6b52f9198561d689b505a8c74a0d0f86b6 (diff) | |
| parent | bc42cbd94bddbdea2714978c11327b4897d6fd0f (diff) | |
| download | forums-a27a39ebed0133dd88322a2c3a9e7228c657a703.tar forums-a27a39ebed0133dd88322a2c3a9e7228c657a703.tar.gz forums-a27a39ebed0133dd88322a2c3a9e7228c657a703.tar.bz2 forums-a27a39ebed0133dd88322a2c3a9e7228c657a703.tar.xz forums-a27a39ebed0133dd88322a2c3a9e7228c657a703.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10046] Do not link bots to cron.php.
[ticket/10046] No longer change $phpbb_root_path to an absolute path for cron.
[ticket/10046] Call flush() in cron.php
[ticket/10046] Remove calls to register_shutdown_function() in cron.php
Conflicts:
phpBB/cron.php
phpBB/includes/functions.php
| -rw-r--r-- | phpBB/common.php | 5 | ||||
| -rw-r--r-- | phpBB/includes/functions.php | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/phpBB/common.php b/phpBB/common.php index 68be033578..ccd043ba70 100644 --- a/phpBB/common.php +++ b/phpBB/common.php @@ -118,11 +118,6 @@ else define('STRIP', (get_magic_quotes_gpc()) ? true : false); } -if (defined('IN_CRON')) -{ - $phpbb_root_path = dirname(__FILE__) . DIRECTORY_SEPARATOR; -} - if (file_exists($phpbb_root_path . 'config.' . $phpEx)) { require($phpbb_root_path . 'config.' . $phpEx); diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 8e8bd56af6..d2e0bcac47 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -4609,7 +4609,7 @@ function page_footer($run_cron = true) // Call cron-type script $call_cron = false; - if (!defined('IN_CRON') && !$config['use_system_cron'] && $run_cron && !$config['board_disable']) + if (!defined('IN_CRON') && !$config['use_system_cron'] && $run_cron && !$config['board_disable'] && !$user->data['is_bot']) { $call_cron = true; $time_now = (!empty($user->time_now) && is_int($user->time_now)) ? $user->time_now : time(); |