diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2012-12-29 13:45:40 -0500 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2012-12-29 13:45:40 -0500 |
| commit | 4dcc8cabae670e0ee57a489e7e13c2f93d99753a (patch) | |
| tree | 79f36cb8cb6db68d5b93deec7999633e5047e4be /phpBB/install/database_update.php | |
| parent | f9354b98d88bb9c6e212a68de813f75508b7dafc (diff) | |
| parent | 61391f648c95251466f805f148f1656e940f2027 (diff) | |
| download | forums-4dcc8cabae670e0ee57a489e7e13c2f93d99753a.tar forums-4dcc8cabae670e0ee57a489e7e13c2f93d99753a.tar.gz forums-4dcc8cabae670e0ee57a489e7e13c2f93d99753a.tar.bz2 forums-4dcc8cabae670e0ee57a489e7e13c2f93d99753a.tar.xz forums-4dcc8cabae670e0ee57a489e7e13c2f93d99753a.zip | |
Merge PR #1130 branch 'EXreaction/ticket/11259' into develop
* EXreaction/ticket/11259:
[ticket/11259] htmlspecialchars($phpbb_admin_path)
[ticket/11259] adm_relative_path -> phpbb_adm_relative_path
[ticket/11259] Also make adm_relative_path available in the container
[ticket/11259] Make phpbb_admin_path available everywhere
Conflicts:
phpBB/install/index.php
phpBB/install/install_update.php
Diffstat (limited to 'phpBB/install/database_update.php')
| -rw-r--r-- | phpBB/install/database_update.php | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index 6160a93a04..bbb40d3976 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -73,6 +73,10 @@ 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 $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); @@ -231,7 +235,7 @@ if ($has_global && !$ga_forum_id) <title><?php echo $lang['UPDATING_TO_LATEST_STABLE']; ?></title> - <link href="../adm/style/admin.css" rel="stylesheet" type="text/css" media="screen" /> + <link href="<?php echo htmlspecialchars($phpbb_admin_path); ?>style/admin.css" rel="stylesheet" type="text/css" media="screen" /> </head> @@ -281,7 +285,7 @@ header('Content-type: text/html; charset=UTF-8'); <title><?php echo $lang['UPDATING_TO_LATEST_STABLE']; ?></title> -<link href="../adm/style/admin.css" rel="stylesheet" type="text/css" media="screen" /> +<link href="<?php echo htmlspecialchars($phpbb_admin_path); ?>style/admin.css" rel="stylesheet" type="text/css" media="screen" /> </head> |