1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-08 01:36:57 +02:00

[ticket/11259] adm_relative_path -> phpbb_adm_relative_path

We can assume they properly format their config settings, right?

PHPBB3-11259
This commit is contained in:
Nathan Guse
2012-12-09 19:29:51 -06:00
parent bff76f9ca8
commit 30de17f69f
6 changed files with 16 additions and 16 deletions

View File

@@ -73,9 +73,9 @@ else
}
@ini_set('memory_limit', $mem_limit);
// In case $adm_relative_path is not set (in case of an update), use the default.
$adm_relative_path = (isset($adm_relative_path)) ? ((substr($adm_relative_path, -1) == '/') ? $adm_relative_path : $adm_relative_path . '/') : 'adm/';
$phpbb_admin_path = (defined('PHPBB_ADMIN_PATH')) ? PHPBB_ADMIN_PATH : $phpbb_root_path . $adm_relative_path;
// In case $phpbb_adm_relative_path is not set (in case of an update), use the default.
$phpbb_adm_relative_path = (isset($phpbb_adm_relative_path)) ? $phpbb_adm_relative_path : 'adm/';
$phpbb_admin_path = (defined('PHPBB_ADMIN_PATH')) ? PHPBB_ADMIN_PATH : $phpbb_root_path . $phpbb_adm_relative_path;
// Include essential scripts
require($phpbb_root_path . 'includes/class_loader.' . $phpEx);