makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-16 08:18:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/11628] Change set_custom_style $template path to default to string

Browse source 
Rather than default to false and compare === false ? 'template/' : value just
assign this default in the arguments

PHPBB3-11628
This commit is contained in:
Nathaniel Guse 2013-07-24 13:01:30 -05:00
parent 4b761f6575
commit 67627f3336
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
phpBB/phpbb/template/template.php
View file

@ -57,10 +57,10 @@ interface phpbb_template
* *
* @param string|array $names Array of names or string of name of template(s) in inheritance tree order, used by extensions. * @param string|array $names Array of names or string of name of template(s) in inheritance tree order, used by extensions.
* @param array or string $paths Array of style paths, relative to current root directory * @param array or string $paths Array of style paths, relative to current root directory
* @param string $template_path Path to templates, relative to style directory. False if path should be set to default (templates/). * @param string $template_path Path to templates, relative to style directory. Default (template/).
* @return phpbb_template $this * @return phpbb_template $this
*/ */
public function set_custom_style($names, $paths, $template_path = false); public function set_custom_style($names, $paths, $template_path = 'template/');
/** /**
* Sets the style names/paths corresponding to style hierarchy being compiled * Sets the style names/paths corresponding to style hierarchy being compiled

6
phpBB/phpbb/template/twig/twig.php
View file

@ -238,10 +238,10 @@ class phpbb_template_twig implements phpbb_template
* *
* @param string|array $names Array of names or string of name of template(s) in inheritance tree order, used by extensions. * @param string|array $names Array of names or string of name of template(s) in inheritance tree order, used by extensions.
* @param array or string $paths Array of style paths, relative to current root directory * @param array or string $paths Array of style paths, relative to current root directory
* @param string $template_path Path to templates, relative to style directory. False if path should be set to default (templates/). * @param string $template_path Path to templates, relative to style directory. Default (template/).
* @return phpbb_template $this * @return phpbb_template $this
*/ */
public function set_custom_style($names, $paths, $template_path = false) public function set_custom_style($names, $paths, $template_path = 'template/')
{ {
if (is_string($paths)) if (is_string($paths))
{ {
@ -256,7 +256,7 @@ class phpbb_template_twig implements phpbb_template
$new_paths = array(); $new_paths = array();
foreach ($paths as $path) foreach ($paths as $path)
{ {
$new_paths[] = $path . '/' . (($template_path !== false) ? $template_path : 'template/'); $new_paths[] = $path . '/' . ltrim($template_path, '/');
} }
$this->set_style_names($names, $new_paths); $this->set_style_names($names, $new_paths);