diff options
| author | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-07-24 13:25:20 -0500 |
|---|---|---|
| committer | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-07-24 13:25:20 -0500 |
| commit | 12c22585069066957cc3211136ebd480295d4758 (patch) | |
| tree | 6358ba04f28a8368ef5806aec70825466c30e778 /phpBB/includes | |
| parent | 863592a8bedbacf3e7bf6bee458797e819020e6f (diff) | |
| download | forums-12c22585069066957cc3211136ebd480295d4758.tar forums-12c22585069066957cc3211136ebd480295d4758.tar.gz forums-12c22585069066957cc3211136ebd480295d4758.tar.bz2 forums-12c22585069066957cc3211136ebd480295d4758.tar.xz forums-12c22585069066957cc3211136ebd480295d4758.zip | |
[ticket/11628] Remove template_path option on set_custom_style
This was set to default 'template/' to append template/ to all the paths,
but every location was actually just setting it to '' to not append anything.
So removed the option entirely (additional paths can be appended to the paths
being sent to the function already)
PHPBB3-11628
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/functions_messenger.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/functions_module.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php index 89dd3c70fc..3a9e1fa77b 100644 --- a/phpBB/includes/functions_messenger.php +++ b/phpBB/includes/functions_messenger.php @@ -660,7 +660,7 @@ class messenger { $this->setup_template(); - $this->template->set_custom_style($path_name, $paths, ''); + $this->template->set_custom_style($path_name, $paths); } } diff --git a/phpBB/includes/functions_module.php b/phpBB/includes/functions_module.php index c84e02afe6..8f0f6a837a 100644 --- a/phpBB/includes/functions_module.php +++ b/phpBB/includes/functions_module.php @@ -508,7 +508,7 @@ class p_master if (is_dir($module_style_dir)) { - $template->set_custom_style('admin', array($module_style_dir, $phpbb_admin_path . 'style'), ''); + $template->set_custom_style('admin', array($module_style_dir, $phpbb_admin_path . 'style')); } } |