diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2017-03-19 00:01:34 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2017-03-19 00:01:34 +0100 |
| commit | e4d253ce76d6480154c2560c9a0b16df51c447ed (patch) | |
| tree | 3c2ea0cfec2682749a2d681cd673707a6fb499e8 /phpBB/includes/acp/acp_styles.php | |
| parent | 5d597787eb49e202eec198d6b6416fb69ef15e3e (diff) | |
| parent | 0f95e607ff91277a50bd5ff04d8a60a553dd918e (diff) | |
| download | forums-e4d253ce76d6480154c2560c9a0b16df51c447ed.tar forums-e4d253ce76d6480154c2560c9a0b16df51c447ed.tar.gz forums-e4d253ce76d6480154c2560c9a0b16df51c447ed.tar.bz2 forums-e4d253ce76d6480154c2560c9a0b16df51c447ed.tar.xz forums-e4d253ce76d6480154c2560c9a0b16df51c447ed.zip | |
Merge branch '3.1.x' into 3.2.x
Diffstat (limited to 'phpBB/includes/acp/acp_styles.php')
| -rw-r--r-- | phpBB/includes/acp/acp_styles.php | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/phpBB/includes/acp/acp_styles.php b/phpBB/includes/acp/acp_styles.php index 7878cbc8e9..b954f90451 100644 --- a/phpBB/includes/acp/acp_styles.php +++ b/phpBB/includes/acp/acp_styles.php @@ -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'], |