diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2012-12-09 19:29:51 -0600 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2012-12-09 19:29:51 -0600 |
| commit | 30de17f69f70a0c23fa314de479bac57e3dbae2b (patch) | |
| tree | 7f431ad636006a0e4216bf9dbcc31d24e64295b7 /phpBB/install/database_update.php | |
| parent | bff76f9ca81e30a03f116669645774ebd49ba1b1 (diff) | |
| download | forums-30de17f69f70a0c23fa314de479bac57e3dbae2b.tar forums-30de17f69f70a0c23fa314de479bac57e3dbae2b.tar.gz forums-30de17f69f70a0c23fa314de479bac57e3dbae2b.tar.bz2 forums-30de17f69f70a0c23fa314de479bac57e3dbae2b.tar.xz forums-30de17f69f70a0c23fa314de479bac57e3dbae2b.zip | |
[ticket/11259] adm_relative_path -> phpbb_adm_relative_path
We can assume they properly format their config settings, right?
PHPBB3-11259
Diffstat (limited to 'phpBB/install/database_update.php')
| -rw-r--r-- | phpBB/install/database_update.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index 38bfe978e5..1600b7bd10 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -73,9 +73,9 @@ if (!defined('PHPBB_INSTALLED') || empty($dbms) || empty($acm_type)) die("Please read: <a href='../docs/INSTALL.html'>INSTALL.html</a> before attempting to update."); } -// 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 files require($phpbb_root_path . 'includes/class_loader.' . $phpEx); |