1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 22:10:45 +02:00

Merge branch '3.1.x' into 3.2.x

This commit is contained in:
Marc Alexander
2017-03-19 00:01:34 +01:00
3 changed files with 9 additions and 0 deletions

View File

@@ -448,6 +448,9 @@ class acp_styles
trigger_error($this->user->lang['NO_MATCHING_STYLES_FOUND'] . adm_back_link($this->u_action), E_USER_WARNING);
}
// Read style configuration file
$style_cfg = $this->read_style_cfg($style['style_path']);
// Find all available parent styles
$list = $this->find_possible_parents($styles, $id);
@@ -595,6 +598,7 @@ class acp_styles
'STYLE_ID' => $style['style_id'],
'STYLE_NAME' => htmlspecialchars($style['style_name']),
'STYLE_PATH' => htmlspecialchars($style['style_path']),
'STYLE_VERSION' => htmlspecialchars($style_cfg['style_version']),
'STYLE_COPYRIGHT' => strip_tags($style['style_copyright']),
'STYLE_PARENT' => $style['style_parent_id'],
'S_STYLE_ACTIVE' => $style['style_active'],