mirror of
https://github.com/phpbb/phpbb.git
synced 2025-08-07 01:06:48 +02:00
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
This commit is contained in:
@@ -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);
|
||||
|
Reference in New Issue
Block a user