diff options
author | Igor Wiedler <igor@wiedler.ch> | 2011-03-12 18:11:47 +0100 |
---|---|---|
committer | Igor Wiedler <igor@wiedler.ch> | 2011-03-12 18:11:47 +0100 |
commit | bc42cbd94bddbdea2714978c11327b4897d6fd0f (patch) | |
tree | 4986bfcb0b451da6163f9a04f8a1099f56bc3674 /phpBB/includes/functions.php | |
parent | 2f57bfb6f297e9711bacb607faf6e33ab516db33 (diff) | |
parent | 9a4804525471b69b1ed0beb4ea7145faeb8855b8 (diff) | |
download | forums-bc42cbd94bddbdea2714978c11327b4897d6fd0f.tar forums-bc42cbd94bddbdea2714978c11327b4897d6fd0f.tar.gz forums-bc42cbd94bddbdea2714978c11327b4897d6fd0f.tar.bz2 forums-bc42cbd94bddbdea2714978c11327b4897d6fd0f.tar.xz forums-bc42cbd94bddbdea2714978c11327b4897d6fd0f.zip |
Merge branch 'ticket/bantu/10046' into develop-olympus
* ticket/bantu/10046:
[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
Diffstat (limited to 'phpBB/includes/functions.php')
-rw-r--r-- | phpBB/includes/functions.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 6a2d132175..80b51f80ae 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -4611,7 +4611,7 @@ function page_footer($run_cron = true) // Call cron-type script $call_cron = false; - if (!defined('IN_CRON') && $run_cron && !$config['board_disable']) + if (!defined('IN_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(); |