diff options
| author | Nils Adermann <naderman@naderman.de> | 2012-04-19 02:39:54 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2012-04-19 02:39:54 +0200 |
| commit | 3d87ab79ca089ba82a6a1d8bead93e18072698e5 (patch) | |
| tree | 31d4aa2ac1dc5989951216cdbbc9becbd88baef8 /phpBB | |
| parent | 6564180a150afc790f82d3e09c53528b6884d1a9 (diff) | |
| parent | bb628044071f40130cdfc632d7f5636a11711ae0 (diff) | |
| download | forums-3d87ab79ca089ba82a6a1d8bead93e18072698e5.tar forums-3d87ab79ca089ba82a6a1d8bead93e18072698e5.tar.gz forums-3d87ab79ca089ba82a6a1d8bead93e18072698e5.tar.bz2 forums-3d87ab79ca089ba82a6a1d8bead93e18072698e5.tar.xz forums-3d87ab79ca089ba82a6a1d8bead93e18072698e5.zip | |
Merge remote-tracking branch 'github-cyberalien/ticket/10762' into develop
* github-cyberalien/ticket/10762:
[ticket/10762] Check for phpbb_version when installing style
[ticket/10762] Changing version format in style.cfg
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/acp/acp_styles.php | 2 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/style.cfg | 3 | ||||
| -rw-r--r-- | phpBB/styles/subsilver2/style.cfg | 3 |
3 files changed, 5 insertions, 3 deletions
diff --git a/phpBB/includes/acp/acp_styles.php b/phpBB/includes/acp/acp_styles.php index d33be274b4..de1f678e38 100644 --- a/phpBB/includes/acp/acp_styles.php +++ b/phpBB/includes/acp/acp_styles.php @@ -1056,7 +1056,7 @@ class acp_styles */ protected function read_style_cfg($dir) { - static $required = array('name', 'version', 'copyright'); + static $required = array('name', 'phpbb_version', 'copyright'); $cfg = parse_cfg_file($this->styles_path . $dir . '/style.cfg'); // Check if it is a valid file diff --git a/phpBB/styles/prosilver/style.cfg b/phpBB/styles/prosilver/style.cfg index a80f1ed537..633079e4a6 100644 --- a/phpBB/styles/prosilver/style.cfg +++ b/phpBB/styles/prosilver/style.cfg @@ -18,7 +18,8 @@ # General Information about this style name = prosilver copyright = © phpBB Group, 2007 -version = 3.1.0-dev +style_version = 3.1.0-dev +phpbb_version = 3.1.0-dev # Defining a different template bitfield # template_bitfield = lNg= diff --git a/phpBB/styles/subsilver2/style.cfg b/phpBB/styles/subsilver2/style.cfg index 1a71e7254d..ca81337d17 100644 --- a/phpBB/styles/subsilver2/style.cfg +++ b/phpBB/styles/subsilver2/style.cfg @@ -18,7 +18,8 @@ # General Information about this style name = subsilver2 copyright = © 2005 phpBB Group -version = 3.1.0-dev +style_version = 3.1.0-dev +phpbb_version = 3.1.0-dev # Defining a different template bitfield # template_bitfield = lNg= |