diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-10-28 10:02:53 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-10-28 10:02:53 +0100 |
| commit | 0682e5719d55a10485050dc1fc7561c32e6b3fb8 (patch) | |
| tree | 808fe81e37131b4414bd91abf8593c5adc82ad6c /phpBB/includes | |
| parent | b9c08cddd47b39355458e828d847c34ab0e8c378 (diff) | |
| parent | 679559ce180ec5210edb3a019e9ca862d7fddf4e (diff) | |
| download | forums-0682e5719d55a10485050dc1fc7561c32e6b3fb8.tar forums-0682e5719d55a10485050dc1fc7561c32e6b3fb8.tar.gz forums-0682e5719d55a10485050dc1fc7561c32e6b3fb8.tar.bz2 forums-0682e5719d55a10485050dc1fc7561c32e6b3fb8.tar.xz forums-0682e5719d55a10485050dc1fc7561c32e6b3fb8.zip | |
Merge branch 'prep-release-3.1.0' into develop-ascraeus
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/functions.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 7700dcfd27..1a3560dbb1 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -5254,7 +5254,7 @@ function page_footer($run_cron = true, $display_template = true, $exit_handler = // Call cron-type script $call_cron = false; - if (!defined('IN_CRON') && !$config['use_system_cron'] && $run_cron && !$config['board_disable'] && !$user->data['is_bot'] && !$cache->get('cron.lock_check')) + if (!defined('IN_CRON') && !$config['use_system_cron'] && $run_cron && !$config['board_disable'] && !$user->data['is_bot'] && !$cache->get('_cron.lock_check')) { $call_cron = true; $time_now = (!empty($user->time_now) && is_int($user->time_now)) ? $user->time_now : time(); @@ -5286,7 +5286,7 @@ function page_footer($run_cron = true, $display_template = true, $exit_handler = } else { - $cache->put('cron.lock_check', true, 300); + $cache->put('_cron.lock_check', true, 60); } } |