diff options
| author | David King <imkingdavid@gmail.com> | 2012-12-10 14:27:18 -0500 |
|---|---|---|
| committer | David King <imkingdavid@gmail.com> | 2012-12-10 14:27:18 -0500 |
| commit | 2212294ba39bc99a0cde3ebc278d1258d9f2abe4 (patch) | |
| tree | e3593674ad71212af835a5f6acf245b655b0fb4b /phpBB/includes | |
| parent | a9db155c28aa4885c1eef70dffe037172222f91d (diff) | |
| parent | a0211ff2eb3a61f627d4ac4732c6ab68c2529d9e (diff) | |
| download | forums-2212294ba39bc99a0cde3ebc278d1258d9f2abe4.tar forums-2212294ba39bc99a0cde3ebc278d1258d9f2abe4.tar.gz forums-2212294ba39bc99a0cde3ebc278d1258d9f2abe4.tar.bz2 forums-2212294ba39bc99a0cde3ebc278d1258d9f2abe4.tar.xz forums-2212294ba39bc99a0cde3ebc278d1258d9f2abe4.zip | |
Merge remote-tracking branch 'p/feature/template-events' into develop
* p/feature/template-events:
[feature/template-events] Pass arguments in correct order.
Conflicts:
phpBB/includes/style/style.php
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/style/style.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/style/style.php b/phpBB/includes/style/style.php index 1b2e756064..4703c3a219 100644 --- a/phpBB/includes/style/style.php +++ b/phpBB/includes/style/style.php @@ -106,7 +106,7 @@ class phpbb_style $paths[] = $this->get_style_path($name); } - return $this->set_custom_style($style_path, $paths, $paths); + return $this->set_custom_style($style_path, $paths, $names); } /** |