makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'p/feature/template-events' into develop

Browse source 
* p/feature/template-events:
  [feature/template-events] Pass arguments in correct order.

Conflicts:
	phpBB/includes/style/style.php
This commit is contained in:
David King 2012-12-10 14:27:18 -05:00
commit 2212294ba3
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/includes/style/style.php
View file

@ -106,7 +106,7 @@ class phpbb_style
$paths[] = $this->get_style_path($name); $paths[] = $this->get_style_path($name);
} }
return $this->set_custom_style($style_path, $paths, $paths); return $this->set_custom_style($style_path, $paths, $names);
} }
/** /**