diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2012-10-15 19:49:28 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2012-10-15 19:49:28 +0200 |
| commit | 72f0e2dd7983d6838f157f708e86364f98e0c86b (patch) | |
| tree | 214b490daefef1e61c29f09d6053c1c462b20cb8 | |
| parent | f1a692a5f45d993fe2578f13d365ca10543696f8 (diff) | |
| parent | 571d352eed670ad986bd653a2ac0bd81429c9cf5 (diff) | |
| download | forums-72f0e2dd7983d6838f157f708e86364f98e0c86b.tar forums-72f0e2dd7983d6838f157f708e86364f98e0c86b.tar.gz forums-72f0e2dd7983d6838f157f708e86364f98e0c86b.tar.bz2 forums-72f0e2dd7983d6838f157f708e86364f98e0c86b.tar.xz forums-72f0e2dd7983d6838f157f708e86364f98e0c86b.zip | |
Merge remote-tracking branch 'mvinny/ticket/11139' into develop
* mvinny/ticket/11139:
[ticket/11139] Adding the $phpbb_admin_path variable
[ticket/11139] Fix fatal error on colour swatch window
| -rw-r--r-- | phpBB/adm/swatch.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/phpBB/adm/swatch.php b/phpBB/adm/swatch.php index 434b00e542..86498a255f 100644 --- a/phpBB/adm/swatch.php +++ b/phpBB/adm/swatch.php @@ -21,8 +21,10 @@ $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 -$template->set_custom_template($phpbb_root_path . 'adm/style', 'admin'); +$phpbb_style->set_custom_style('admin', $phpbb_admin_path . 'style', ''); $template->set_filenames(array( 'body' => 'colour_swatch.html') |