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/adm | |
| 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/adm')
| -rw-r--r-- | phpBB/adm/index.php | 1 | ||||
| -rw-r--r-- | phpBB/adm/style/install_header.html | 6 | ||||
| -rw-r--r-- | phpBB/adm/style/install_update_diff.html | 2 | ||||
| -rw-r--r-- | phpBB/adm/swatch.php | 2 |
4 files changed, 4 insertions, 7 deletions
diff --git a/phpBB/adm/index.php b/phpBB/adm/index.php index 0f84af6f9e..564a19ce64 100644 --- a/phpBB/adm/index.php +++ b/phpBB/adm/index.php @@ -42,7 +42,6 @@ if (!$auth->acl_get('a_')) // We define the admin variables now, because the user is now able to use the admin related features... define('IN_ADMIN', true); -$phpbb_admin_path = (defined('PHPBB_ADMIN_PATH')) ? PHPBB_ADMIN_PATH : './'; // Some oft used variables $safe_mode = (@ini_get('safe_mode') == '1' || strtolower(@ini_get('safe_mode')) === 'on') ? true : false; diff --git a/phpBB/adm/style/install_header.html b/phpBB/adm/style/install_header.html index 6826654ded..5631b83e17 100644 --- a/phpBB/adm/style/install_header.html +++ b/phpBB/adm/style/install_header.html @@ -5,7 +5,7 @@ <!-- IF META -->{META}<!-- ENDIF --> <title>{PAGE_TITLE}</title> -<link href="../adm/style/admin.css" rel="stylesheet" type="text/css" media="screen" /> +<link href="{T_TEMPLATE_PATH}/admin.css" rel="stylesheet" type="text/css" media="screen" /> <script type="text/javascript"> // <![CDATA[ @@ -49,7 +49,7 @@ function dE(n, s, type) </form> <!-- ENDIF --> </div> - + <div id="page-body"> <div id="tabs"> <ul> @@ -73,5 +73,5 @@ function dE(n, s, type) <!-- END l_block2 --> </ul> </div> - + <div id="main" class="install-body"> diff --git a/phpBB/adm/style/install_update_diff.html b/phpBB/adm/style/install_update_diff.html index ecdc40e157..1f30fe4d13 100644 --- a/phpBB/adm/style/install_update_diff.html +++ b/phpBB/adm/style/install_update_diff.html @@ -5,7 +5,7 @@ <!-- IF META -->{META}<!-- ENDIF --> <title>{PAGE_TITLE}</title> -<link href="../adm/style/admin.css" rel="stylesheet" type="text/css" media="screen" /> +<link href="{T_TEMPLATE_PATH}/admin.css" rel="stylesheet" type="text/css" media="screen" /> <script type="text/javascript"> // <![CDATA[ diff --git a/phpBB/adm/swatch.php b/phpBB/adm/swatch.php index c01651e0f0..3ae38d0d8b 100644 --- a/phpBB/adm/swatch.php +++ b/phpBB/adm/swatch.php @@ -21,8 +21,6 @@ $user->session_begin(false); $auth->acl($user->data); $user->setup(); -$phpbb_admin_path = (defined('PHPBB_ADMIN_PATH')) ? PHPBB_ADMIN_PATH : './'; - // Set custom template for admin area $phpbb_style->set_custom_style('admin', $phpbb_admin_path . 'style', array(), ''); |