diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2013-01-04 10:49:57 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2013-01-04 10:49:57 +0100 |
| commit | 5d091e2d8f5079a8ce8dc14500c29f6642c40e98 (patch) | |
| tree | f4c73527be7e6f5e783351edc306e929a8946b31 /phpBB/adm | |
| parent | 4a8b1a6e050bba7f8f73f689bbca4185ab27cf8c (diff) | |
| parent | 228580b6743b9650996284dd04a3f5de6c2447ca (diff) | |
| download | forums-5d091e2d8f5079a8ce8dc14500c29f6642c40e98.tar forums-5d091e2d8f5079a8ce8dc14500c29f6642c40e98.tar.gz forums-5d091e2d8f5079a8ce8dc14500c29f6642c40e98.tar.bz2 forums-5d091e2d8f5079a8ce8dc14500c29f6642c40e98.tar.xz forums-5d091e2d8f5079a8ce8dc14500c29f6642c40e98.zip | |
Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/avatars
Conflicts:
phpBB/includes/ucp/ucp_groups.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(), ''); |