aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorDavid King <imkingdavid@gmail.com>2013-05-31 22:39:40 -0400
committerDavid King <imkingdavid@gmail.com>2013-05-31 22:39:40 -0400
commit4b61178d05bf41364393e4751d32398ff24fc221 (patch)
treefbaca7c4dc0ec053c03484a58caaee0350e2389b /phpBB
parent69e1b402df1fe5ee7e773925a192129d6c4dd97d (diff)
parent48036c6edaa778cbeb6cc7ad9018846a659bb0b0 (diff)
downloadforums-4b61178d05bf41364393e4751d32398ff24fc221.tar
forums-4b61178d05bf41364393e4751d32398ff24fc221.tar.gz
forums-4b61178d05bf41364393e4751d32398ff24fc221.tar.bz2
forums-4b61178d05bf41364393e4751d32398ff24fc221.tar.xz
forums-4b61178d05bf41364393e4751d32398ff24fc221.zip
Merge remote-tracking branch 'nickvergessen/ticket/11549' into develop
* nickvergessen/ticket/11549: [ticket/11549] Add functional test for ACP Extension Module with Template [ticket/11549] Do not set extension dir path for style in adm/index.php
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/adm/index.php1
1 files changed, 0 insertions, 1 deletions
diff --git a/phpBB/adm/index.php b/phpBB/adm/index.php
index 564a19ce64..8cd1967c75 100644
--- a/phpBB/adm/index.php
+++ b/phpBB/adm/index.php
@@ -50,7 +50,6 @@ $module_id = request_var('i', '');
$mode = request_var('mode', '');
// Set custom style for admin area
-$phpbb_style->set_ext_dir_prefix('adm/');
$phpbb_style->set_custom_style('admin', $phpbb_admin_path . 'style', array(), '');
$template->assign_var('T_ASSETS_PATH', $phpbb_root_path . 'assets');
$template->assign_var('T_TEMPLATE_PATH', $phpbb_admin_path . 'style');