mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-06 16:56:44 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop-olympus' into develop

Browse Source 
* 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:
Igor Wiedler
2011-03-12 18:16:10 +01:00
parent df096b6b52 bc42cbd94b
commit a27a39ebed
2 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
phpBB/common.php
View File

@@ -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);