makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 22:28:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'github-cyberalien/ticket/10762' into develop

Browse source 
* github-cyberalien/ticket/10762:
  [ticket/10762] Check for phpbb_version when installing style
  [ticket/10762] Changing version format in style.cfg
This commit is contained in:
Nils Adermann 2012-04-19 02:39:54 +02:00
commit 3d87ab79ca
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/includes/acp/acp_styles.php
View file

@ -1056,7 +1056,7 @@ class acp_styles
*/ */
protected function read_style_cfg($dir) 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'); $cfg = parse_cfg_file($this->styles_path . $dir . '/style.cfg');
// Check if it is a valid file // Check if it is a valid file

3
phpBB/styles/prosilver/style.cfg
View file

@ -18,7 +18,8 @@
# General Information about this style # General Information about this style
name = prosilver name = prosilver
copyright = © phpBB Group, 2007 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 # Defining a different template bitfield
# template_bitfield = lNg= # template_bitfield = lNg=

3
phpBB/styles/subsilver2/style.cfg
View file

@ -18,7 +18,8 @@
# General Information about this style # General Information about this style
name = subsilver2 name = subsilver2
copyright = © 2005 phpBB Group 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 # Defining a different template bitfield
# template_bitfield = lNg= # template_bitfield = lNg=