mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-15 05:04:09 +02:00
Code Issues Releases 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
Download Patch File Download Diff File Expand all files Collapse all files

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), '');
}
}