diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2012-11-08 12:21:06 -0500 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2012-11-17 16:42:40 -0500 |
| commit | 44d6dc4c4ccf969fd3d84f3b39bfd24ecd3a3f9d (patch) | |
| tree | 5dd030f606400f049141dbc9b086e6288b6dd0b7 /phpBB/adm | |
| parent | 0a29312d830c65dc293822c291bf2efd6f93a29b (diff) | |
| download | forums-44d6dc4c4ccf969fd3d84f3b39bfd24ecd3a3f9d.tar forums-44d6dc4c4ccf969fd3d84f3b39bfd24ecd3a3f9d.tar.gz forums-44d6dc4c4ccf969fd3d84f3b39bfd24ecd3a3f9d.tar.bz2 forums-44d6dc4c4ccf969fd3d84f3b39bfd24ecd3a3f9d.tar.xz forums-44d6dc4c4ccf969fd3d84f3b39bfd24ecd3a3f9d.zip | |
[feature/template-events] Convert a single style name to array of them.
This allows template code to know the entire style hierarchy for
templates being rendered.
PHPBB3-9550
Diffstat (limited to 'phpBB/adm')
| -rw-r--r-- | phpBB/adm/index.php | 2 | ||||
| -rw-r--r-- | phpBB/adm/swatch.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/adm/index.php b/phpBB/adm/index.php index e20bbe4bec..0f84af6f9e 100644 --- a/phpBB/adm/index.php +++ b/phpBB/adm/index.php @@ -52,7 +52,7 @@ $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', ''); +$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'); diff --git a/phpBB/adm/swatch.php b/phpBB/adm/swatch.php index 86498a255f..c01651e0f0 100644 --- a/phpBB/adm/swatch.php +++ b/phpBB/adm/swatch.php @@ -24,7 +24,7 @@ $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', ''); +$phpbb_style->set_custom_style('admin', $phpbb_admin_path . 'style', array(), ''); $template->set_filenames(array( 'body' => 'colour_swatch.html') |