aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2017-03-19 00:01:30 +0100
committerMarc Alexander <admin@m-a-styles.de>2017-03-19 00:01:30 +0100
commit0f95e607ff91277a50bd5ff04d8a60a553dd918e (patch)
treef2a10620d2758e5d0aaf799811a1204fa58d0649 /phpBB/includes
parent9267235f30b3275b4b00f49f99c6ae259ce26a3f (diff)
parentd10a5b67a1d508b2c48924678650b8d03c8f129d (diff)
downloadforums-0f95e607ff91277a50bd5ff04d8a60a553dd918e.tar
forums-0f95e607ff91277a50bd5ff04d8a60a553dd918e.tar.gz
forums-0f95e607ff91277a50bd5ff04d8a60a553dd918e.tar.bz2
forums-0f95e607ff91277a50bd5ff04d8a60a553dd918e.tar.xz
forums-0f95e607ff91277a50bd5ff04d8a60a553dd918e.zip
Merge pull request #4743 from rubencm/ticket/14820
[ticket/14820] Add style version in ACP
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/acp/acp_styles.php4
1 files changed, 4 insertions, 0 deletions
diff --git a/phpBB/includes/acp/acp_styles.php b/phpBB/includes/acp/acp_styles.php
index 5181b87ecb..c29fb062d8 100644
--- a/phpBB/includes/acp/acp_styles.php
+++ b/phpBB/includes/acp/acp_styles.php
@@ -433,6 +433,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);
@@ -579,6 +582,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'],