aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNathaniel Guse <nathaniel.guse@gmail.com>2013-07-24 13:25:20 -0500
committerNathaniel Guse <nathaniel.guse@gmail.com>2013-07-24 13:25:20 -0500
commit12c22585069066957cc3211136ebd480295d4758 (patch)
tree6358ba04f28a8368ef5806aec70825466c30e778
parent863592a8bedbacf3e7bf6bee458797e819020e6f (diff)
downloadforums-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
-rw-r--r--phpBB/adm/index.php2
-rw-r--r--phpBB/adm/swatch.php2
-rw-r--r--phpBB/includes/functions_messenger.php2
-rw-r--r--phpBB/includes/functions_module.php2
-rw-r--r--phpBB/install/index.php2
-rw-r--r--phpBB/install/install_update.php2
-rw-r--r--phpBB/phpbb/template/template.php3
-rw-r--r--phpBB/phpbb/template/twig/twig.php13
-rw-r--r--tests/template/includephp_test.php2
-rw-r--r--tests/template/template_events_test.php2
-rw-r--r--tests/template/template_test.php2
-rw-r--r--tests/template/template_test_case.php2
-rw-r--r--tests/template/template_test_case_with_tree.php2
13 files changed, 15 insertions, 23 deletions
diff --git a/phpBB/adm/index.php b/phpBB/adm/index.php
index c79327d22c..3520eb8b70 100644
--- a/phpBB/adm/index.php
+++ b/phpBB/adm/index.php
@@ -50,7 +50,7 @@ $module_id = request_var('i', '');
$mode = request_var('mode', '');
// Set custom style for admin area
-$template->set_custom_style('admin', $phpbb_admin_path . 'style', '');
+$template->set_custom_style('admin', $phpbb_admin_path . 'style');
$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 ef89081dc8..cdd6bf3969 100644
--- a/phpBB/adm/swatch.php
+++ b/phpBB/adm/swatch.php
@@ -22,7 +22,7 @@ $auth->acl($user->data);
$user->setup();
// Set custom template for admin area
-$template->set_custom_style('admin', $phpbb_admin_path . 'style', '');
+$template->set_custom_style('admin', $phpbb_admin_path . 'style');
$template->set_filenames(array(
'body' => 'colour_swatch.html')
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'));
}
}
diff --git a/phpBB/install/index.php b/phpBB/install/index.php
index f80b975e2c..84d751e279 100644
--- a/phpBB/install/index.php
+++ b/phpBB/install/index.php
@@ -213,7 +213,7 @@ $config = new phpbb_config(array(
));
$template = new phpbb_template_twig($phpbb_root_path, $phpEx, $config, $user, new phpbb_template_context());
-$template->set_custom_style('admin', $phpbb_admin_path . 'style', '');
+$template->set_custom_style('admin', $phpbb_admin_path . 'style');
$template->assign_var('T_ASSETS_PATH', '../assets');
$template->assign_var('T_TEMPLATE_PATH', $phpbb_admin_path . 'style');
diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php
index 63f10c96d7..a105944fb3 100644
--- a/phpBB/install/install_update.php
+++ b/phpBB/install/install_update.php
@@ -138,7 +138,7 @@ class install_update extends module
}
// Set custom template again. ;)
- $template->set_custom_style('admin', $phpbb_admin_path . 'style', '');
+ $template->set_custom_style('admin', $phpbb_admin_path . 'style');
$template->assign_vars(array(
'S_USER_LANG' => $user->lang['USER_LANG'],
diff --git a/phpBB/phpbb/template/template.php b/phpBB/phpbb/template/template.php
index 8554365c95..9881938a8f 100644
--- a/phpBB/phpbb/template/template.php
+++ b/phpBB/phpbb/template/template.php
@@ -57,10 +57,9 @@ 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 array or string $paths Array of style paths, relative to current root directory
- * @param string $template_path Path to templates, relative to style directory. Default (template/).
* @return phpbb_template $this
*/
- public function set_custom_style($names, $paths, $template_path = 'template/');
+ public function set_custom_style($names, $paths);
/**
* Clears all variables and blocks assigned to this template.
diff --git a/phpBB/phpbb/template/twig/twig.php b/phpBB/phpbb/template/twig/twig.php
index 26f454e972..4aa1774ef4 100644
--- a/phpBB/phpbb/template/twig/twig.php
+++ b/phpBB/phpbb/template/twig/twig.php
@@ -225,7 +225,7 @@ class phpbb_template_twig implements phpbb_template
$this->twig->getLoader()->setPaths($paths, 'core');
}
- $this->set_custom_style($names, $paths, '');
+ $this->set_custom_style($names, $paths);
return $this;
}
@@ -237,10 +237,9 @@ 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 array or string $paths Array of style paths, relative to current root directory
- * @param string $template_path Path to templates, relative to style directory. Default (template/).
* @return phpbb_template $this
*/
- public function set_custom_style($names, $paths, $template_path = 'template/')
+ public function set_custom_style($names, $paths)
{
if (is_string($paths))
{
@@ -252,14 +251,8 @@ class phpbb_template_twig implements phpbb_template
$names = array($names);
}
- $style_paths = array();
- foreach ($paths as $path)
- {
- $style_paths[] = $path . '/' . ltrim($template_path, '/');
- }
-
// Set as __main__ namespace
- $this->twig->getLoader()->setPaths($style_paths);
+ $this->twig->getLoader()->setPaths($paths);
// Add all namespaces for all extensions
if ($this->extension_manager instanceof phpbb_extension_manager)
diff --git a/tests/template/includephp_test.php b/tests/template/includephp_test.php
index 70e7cea232..a0dd8368cf 100644
--- a/tests/template/includephp_test.php
+++ b/tests/template/includephp_test.php
@@ -46,7 +46,7 @@ class phpbb_template_includephp_test extends phpbb_template_template_test_case
$this->setup_engine(array('tpl_allow_php' => true));
- $this->template->set_custom_style('tests', $cache_dir, '');
+ $this->template->set_custom_style('tests', $cache_dir);
$this->run_template('includephp_absolute.html', array(), array(), array(), "Path is absolute.\ntesting included php");
diff --git a/tests/template/template_events_test.php b/tests/template/template_events_test.php
index 1b2ab38e2b..f0cdeb39c5 100644
--- a/tests/template/template_events_test.php
+++ b/tests/template/template_events_test.php
@@ -107,6 +107,6 @@ Zeta test event in all',
dirname(__FILE__) . "/datasets/$dataset/"
);
$this->template = new phpbb_template_twig($phpbb_root_path, $phpEx, $config, $user, new phpbb_template_context, $this->extension_manager);
- $this->template->set_custom_style(((!empty($style_names)) ? $style_names : 'silver'), array($this->template_path), '');
+ $this->template->set_custom_style(((!empty($style_names)) ? $style_names : 'silver'), array($this->template_path));
}
}
diff --git a/tests/template/template_test.php b/tests/template/template_test.php
index 0cc53f4d07..2f3ca6e313 100644
--- a/tests/template/template_test.php
+++ b/tests/template/template_test.php
@@ -410,7 +410,7 @@ class phpbb_template_template_test extends phpbb_template_template_test_case
$this->setup_engine(array('tpl_allow_php' => true));
- $this->template->set_custom_style('tests', $cache_dir, '');
+ $this->template->set_custom_style('tests', $cache_dir);
$this->run_template('php.html', array(), array(), array(), 'test');
}
diff --git a/tests/template/template_test_case.php b/tests/template/template_test_case.php
index 00c89e4501..91895502ad 100644
--- a/tests/template/template_test_case.php
+++ b/tests/template/template_test_case.php
@@ -65,7 +65,7 @@ class phpbb_template_template_test_case extends phpbb_test_case
$this->template_path = $this->test_path . '/templates';
$this->template = new phpbb_template_twig($phpbb_root_path, $phpEx, $config, $this->user, new phpbb_template_context());
- $this->template->set_custom_style('tests', $this->template_path, '');
+ $this->template->set_custom_style('tests', $this->template_path);
}
protected function setUp()
diff --git a/tests/template/template_test_case_with_tree.php b/tests/template/template_test_case_with_tree.php
index 1a29fd27b0..477192c28a 100644
--- a/tests/template/template_test_case_with_tree.php
+++ b/tests/template/template_test_case_with_tree.php
@@ -21,6 +21,6 @@ class phpbb_template_template_test_case_with_tree extends phpbb_template_templat
$this->template_path = $this->test_path . '/templates';
$this->parent_template_path = $this->test_path . '/parent_templates';
$this->template = new phpbb_template_twig($phpbb_root_path, $phpEx, $config, $user, new phpbb_template_context());
- $this->template->set_custom_style('tests', array($this->template_path, $this->parent_template_path), '');
+ $this->template->set_custom_style('tests', array($this->template_path, $this->parent_template_path));
}
}
generated by cgit v1.2.1 (git 2.21.0) at 2024-09-23 18:06:49 +0000