diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-10-28 10:03:09 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-10-28 10:03:09 +0100 |
| commit | 5426e9c70095e02ec7db11119eb5a08b0311a427 (patch) | |
| tree | 630ac55635a24bb4eb4853e83d9eb1644ce8b53f /phpBB/includes/functions.php | |
| parent | 2438bfbfc66689beb8e22b80564a2b877f6763ba (diff) | |
| parent | 0682e5719d55a10485050dc1fc7561c32e6b3fb8 (diff) | |
| download | forums-5426e9c70095e02ec7db11119eb5a08b0311a427.tar forums-5426e9c70095e02ec7db11119eb5a08b0311a427.tar.gz forums-5426e9c70095e02ec7db11119eb5a08b0311a427.tar.bz2 forums-5426e9c70095e02ec7db11119eb5a08b0311a427.tar.xz forums-5426e9c70095e02ec7db11119eb5a08b0311a427.zip | |
Merge branch 'develop-ascraeus' into develop
Diffstat (limited to 'phpBB/includes/functions.php')
| -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); } } |