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

Merge branch 'develop-olympus' into develop

Browse source 
* develop-olympus:
  [ticket/10616] Add template inheritance to exported template
  [ticket/10616] Ignore template inheritance that points to self
  [ticket/10616] Add template inheritance to default styles
This commit is contained in:
Igor Wiedler 2012-02-07 16:57:09 +01:00
commit d4e00b6c0d
4 changed files with 22 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -83,11 +83,11 @@ version = {VERSION}
$this->template_cfg .= ' $this->template_cfg .= '
# Some configuration options # Some configuration options
# # Template inheritance
# You can use this function to inherit templates from another template. # See http://blog.phpbb.com/2008/07/31/templating-just-got-easier/
# The template of the given name has to be installed. # Set value to empty or this template name to ignore template inheritance.
# Templates cannot inherit from inheriting templates. inherit_from = {INHERIT_FROM}
#'; ';
// Execute overall actions // Execute overall actions
switch ($action) switch ($action)
@ -1346,9 +1346,7 @@ version = {VERSION}
// Export template core code // Export template core code
if ($mode == 'template' || $inc_template) if ($mode == 'template' || $inc_template)
{ {
$template_cfg = str_replace(array('{MODE}', '{NAME}', '{COPYRIGHT}', '{VERSION}'), array($mode, $style_row['template_name'], $style_row['template_copyright'], $config['version']), $this->template_cfg); $use_template_name = $style_row['template_name'];
$use_template_name = '';
// Add the inherit from variable, depending on it's use... // Add the inherit from variable, depending on it's use...
if ($style_row['template_inherits_id']) if ($style_row['template_inherits_id'])
@ -1362,7 +1360,8 @@ version = {VERSION}
$db->sql_freeresult($result); $db->sql_freeresult($result);
} }
$template_cfg .= ($use_template_name) ? "\ninherit_from = $use_template_name" : "\n#inherit_from = "; $template_cfg = str_replace(array('{MODE}', '{NAME}', '{COPYRIGHT}', '{VERSION}', '{INHERIT_FROM}'), array($mode, $style_row['template_name'], $style_row['template_copyright'], $config['version'], $use_template_name), $this->template_cfg);
$template_cfg .= "\n\nbbcode_bitfield = {$style_row['bbcode_bitfield']}"; $template_cfg .= "\n\nbbcode_bitfield = {$style_row['bbcode_bitfield']}";
$data[] = array( $data[] = array(

5
phpBB/includes/functions.php
View file

@ -3091,6 +3091,11 @@ function parse_cfg_file($filename, $lines = false)
$parsed_items[$key] = $value; $parsed_items[$key] = $value;
} }
if (isset($parsed_items['inherit_from']) && isset($parsed_items['name']) && $parsed_items['inherit_from'] == $parsed_items['name'])
{
unset($parsed_items['inherit_from']);
}
return $parsed_items; return $parsed_items;
} }

5
phpBB/styles/prosilver/template/template.cfg
View file

@ -23,3 +23,8 @@ version = 3.1.0-dev
# Defining a different template bitfield # Defining a different template bitfield
template_bitfield = lNg= template_bitfield = lNg=
# Template inheritance
# See http://blog.phpbb.com/2008/07/31/templating-just-got-easier/
# Set value to empty to ignore template inheritance
inherit_from = prosilver

4
phpBB/styles/subsilver2/template/template.cfg
View file

@ -21,3 +21,7 @@ name = subsilver2
copyright = © phpBB Group, 2003 copyright = © phpBB Group, 2003
version = 3.1.0-dev version = 3.1.0-dev
# Template inheritance
# See http://blog.phpbb.com/2008/07/31/templating-just-got-easier/
# Set value to empty to ignore template inheritance
inherit_from = subsilver2