diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2014-08-06 23:42:35 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2014-08-06 23:42:35 +0200 |
| commit | 3e52126446a286e1c22c7d5a8edf8f592c0ccb03 (patch) | |
| tree | 3f606ed6f4078d04ffb04049b9e14ac8baa5048d | |
| parent | e49de5311540273a7d6d7a6ac53d57b55dbca286 (diff) | |
| parent | decc896bf5e028e3e86ade2db42937f9378e6b58 (diff) | |
| download | forums-3e52126446a286e1c22c7d5a8edf8f592c0ccb03.tar forums-3e52126446a286e1c22c7d5a8edf8f592c0ccb03.tar.gz forums-3e52126446a286e1c22c7d5a8edf8f592c0ccb03.tar.bz2 forums-3e52126446a286e1c22c7d5a8edf8f592c0ccb03.tar.xz forums-3e52126446a286e1c22c7d5a8edf8f592c0ccb03.zip | |
Merge branch 'develop-ascraeus' into develop
| -rw-r--r-- | phpBB/includes/acp/acp_styles.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/acp/acp_styles.php b/phpBB/includes/acp/acp_styles.php index 4cc93e5670..2a02e3e845 100644 --- a/phpBB/includes/acp/acp_styles.php +++ b/phpBB/includes/acp/acp_styles.php @@ -804,7 +804,7 @@ class acp_styles * * @param array $styles Styles list, passed as reference * @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) { @@ -888,7 +888,7 @@ class acp_styles * Show item in styles list * * @param array $style style row - * @param array $level style inheritance level + * @param int $level style inheritance level */ protected function list_style(&$style, $level) { |
