diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2017-03-19 00:01:30 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2017-03-19 00:01:30 +0100 |
| commit | 0f95e607ff91277a50bd5ff04d8a60a553dd918e (patch) | |
| tree | f2a10620d2758e5d0aaf799811a1204fa58d0649 | |
| parent | 9267235f30b3275b4b00f49f99c6ae259ce26a3f (diff) | |
| parent | d10a5b67a1d508b2c48924678650b8d03c8f129d (diff) | |
| download | forums-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
| -rw-r--r-- | phpBB/adm/style/acp_styles.html | 4 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_styles.php | 4 | ||||
| -rw-r--r-- | phpBB/language/en/acp/styles.php | 1 |
3 files changed, 9 insertions, 0 deletions
diff --git a/phpBB/adm/style/acp_styles.html b/phpBB/adm/style/acp_styles.html index a36d15fe73..43c2f96a65 100644 --- a/phpBB/adm/style/acp_styles.html +++ b/phpBB/adm/style/acp_styles.html @@ -52,6 +52,10 @@ <dd><strong>{STYLE_PATH}</strong></dd> </dl> <dl> + <dt><label>{L_STYLE_VERSION}{L_COLON}</label></dt> + <dd><strong>{STYLE_VERSION}</strong></dd> + </dl> + <dl> <dt><label for="name">{L_COPYRIGHT}{L_COLON}</label></dt> <dd><strong>{STYLE_COPYRIGHT}</strong></dd> </dl> 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'], diff --git a/phpBB/language/en/acp/styles.php b/phpBB/language/en/acp/styles.php index 0d91eb3704..9293d67ecc 100644 --- a/phpBB/language/en/acp/styles.php +++ b/phpBB/language/en/acp/styles.php @@ -81,6 +81,7 @@ $lang = array_merge($lang, array( 'STYLE_UNINSTALL_DEPENDENT' => 'Style "%s" cannot be uninstalled because it has one or more child styles.', 'STYLE_UNINSTALLED' => 'Style "%s" uninstalled successfully.', 'STYLE_USED_BY' => 'Used by (including robots)', + 'STYLE_VERSION' => 'Style version', 'UNINSTALL_DEFAULT' => 'You cannot uninstall the default style.', |