makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-24 02:48:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/11628] Remove third parameter ($names) from set_custom_style

Browse source 
This was basically duplicating functionality. $names would be used if not
empty, else array($name) would be used. Merged functionality into the first
argument

PHPBB3-11628
This commit is contained in:
Nathaniel Guse 2013-07-24 12:55:41 -05:00
parent bfbc7aa742
commit 4b761f6575
12 changed files with 16 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/adm/index.php
View file

@ -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', array(), '');
$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');

2
phpBB/adm/swatch.php
View file

@ -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', array(), '');
$template->set_custom_style('admin', $phpbb_admin_path . 'style', '');
$template->set_filenames(array(
'body' => 'colour_swatch.html')

2
phpBB/includes/functions_module.php
View file

@ -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'), array(), '');
$template->set_custom_style('admin', array($module_style_dir, $phpbb_admin_path . 'style'), '');
}
}

2
phpBB/install/index.php
View file

@ -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', array(), '');
$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');

2
phpBB/install/install_update.php
View file

@ -138,7 +138,7 @@ class install_update extends module
}
// Set custom template again. ;)
$template->set_custom_style('admin', $phpbb_admin_path . 'style', array(), '');
$template->set_custom_style('admin', $phpbb_admin_path . 'style', '');
$template->assign_vars(array(
'S_USER_LANG' => $user->lang['USER_LANG'],

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

@ -55,13 +55,12 @@ interface phpbb_template
*
* Note: Templates are still compiled to phpBB's cache directory.
*
* @param string $name Name of style, used for cache prefix. Examples: "admin", "prosilver"
* @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 $names Array of names of templates in inheritance tree order, used by extensions. If empty, $name will be used.
* @param string $template_path Path to templates, relative to style directory. False if path should be set to default (templates/).
* @return phpbb_template $this
*/
public function set_custom_style($name, $paths, $names = array(), $template_path = false);
public function set_custom_style($names, $paths, $template_path = false);
/**
* Sets the style names/paths corresponding to style hierarchy being compiled

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

@ -236,22 +236,21 @@ class phpbb_template_twig implements phpbb_template
*
* Note: Templates are still compiled to phpBB's cache directory.
*
* @param string $name Name of style, used for cache prefix. Examples: "admin", "prosilver"
* @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 $names Array of names of templates in inheritance tree order, used by extensions. If empty, $name will be used.
* @param string $template_path Path to templates, relative to style directory. False if path should be set to default (templates/).
* @return phpbb_template $this
*/
public function set_custom_style($name, $paths, $names = array(), $template_path = false)
public function set_custom_style($names, $paths, $template_path = false)
{
if (is_string($paths))
{
$paths = array($paths);
}
if (empty($names))
if (!is_array($names))
{
$names = array($name);
$names = array($names);
}
$new_paths = array();

2
tests/template/includephp_test.php
View file

@ -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, array(), '');
$this->template->set_custom_style('tests', $cache_dir, '');
$this->run_template('includephp_absolute.html', array(), array(), array(), "Path is absolute.\ntesting included php");

2
tests/template/template_events_test.php
View file

@ -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('silver', array($this->template_path), $style_names, '');
$this->template->set_custom_style(((!empty($style_names)) ? $style_names : 'silver'), array($this->template_path), '');
}
}

2
tests/template/template_test.php
View file

@ -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, array(), '');
$this->template->set_custom_style('tests', $cache_dir, '');
$this->run_template('php.html', array(), array(), array(), 'test');
}

2
tests/template/template_test_case.php
View file

@ -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, array(), '');
$this->template->set_custom_style('tests', $this->template_path, '');
}
protected function setUp()

2
tests/template/template_test_case_with_tree.php
View file

@ -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), array(), '');
$this->template->set_custom_style('tests', array($this->template_path, $this->parent_template_path), '');
}
}