Merge branch 'develop-ascraeus' into develop

This commit is contained in:
Marc Alexander 2014-08-06 23:42:35 +02:00
commit 3e52126446

View file

@ -804,7 +804,7 @@ class acp_styles
* *
* @param array $styles Styles list, passed as reference * @param array $styles Styles list, passed as reference
* @param string $name Name of parent style * @param string $name Name of parent style
* @param string $level Styles tree level * @param int $level Styles tree level
*/ */
protected function show_available_child_styles(&$styles, $name, $level) protected function show_available_child_styles(&$styles, $name, $level)
{ {
@ -888,7 +888,7 @@ class acp_styles
* Show item in styles list * Show item in styles list
* *
* @param array $style style row * @param array $style style row
* @param array $level style inheritance level * @param int $level style inheritance level
*/ */
protected function list_style(&$style, $level) protected function list_style(&$style, $level)
{ {