mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-01 22:40:39 +02:00
Code Issues Releases Wiki Activity

[ticket/11628] Remove the one usage of get_style_path()

Browse Source 
Makes the code easier to follow

PHPBB3-11628
This commit is contained in:
Nathaniel Guse
2013-07-24 13:31:09 -05:00
parent 3b46f77e4e
commit 8795a354fe
2 changed files with 3 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/phpbb/template/template.php
View File

@@ -56,7 +56,7 @@ interface phpbb_template
* Note: Templates are still compiled to phpBB's cache directory. * Note: Templates are still compiled to phpBB's cache directory.
* *
* @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 string|array or string $paths Array of style paths, relative to current root directory
* @return phpbb_template $this * @return phpbb_template $this
*/ */
public function set_custom_style($names, $paths); public function set_custom_style($names, $paths);

18
phpBB/phpbb/template/twig/twig.php
View File

@@ -208,7 +208,7 @@ class phpbb_template_twig implements phpbb_template
{ {
foreach ($names as $name) foreach ($names as $name)
{ {
$path = $this->get_style_path($name, $directory) . 'template/'; $path = $this->phpbb_root_path . trim($directory, '/') . "/{$name}/template/";
if (is_dir($path)) if (is_dir($path))
{ {
@@ -236,7 +236,7 @@ class phpbb_template_twig implements phpbb_template
* Note: Templates are still compiled to phpBB's cache directory. * Note: Templates are still compiled to phpBB's cache directory.
* *
* @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 string|array or string $paths Array of style paths, relative to current root directory
* @return phpbb_template $this * @return phpbb_template $this
*/ */
public function set_custom_style($names, $paths) public function set_custom_style($names, $paths)
@@ -503,18 +503,4 @@ class phpbb_template_twig implements phpbb_template
{ {
return $this->twig->getLoader()->getCacheKey($this->get_filename_from_handle($handle)); return $this->twig->getLoader()->getCacheKey($this->get_filename_from_handle($handle));
} }
/**
* Get location of style directory for specific style_path
*
* @param string $path Style path, such as "prosilver"
* @param string $style_base_directory The base directory the style is in
* E.g. 'styles', 'ext/foo/bar/styles'
* Default: 'styles'
* @return string Path to style directory, relative to current path
*/
protected function get_style_path($path, $style_base_directory = 'styles')
{
return $this->phpbb_root_path . trim($style_base_directory, '/') . '/' . rtrim($path, '/') . '/';
}
} }