makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-27 04:18:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/10616] Add template inheritance to exported template

Browse source 
Add template inheritance when exporting template.cfg

PHPBB3-10616
This commit is contained in:
Vjacheslav Trushkin 2012-02-03 16:19:42 +02:00
parent 4aef6ea979
commit 326ff46ef7
1 changed files with 8 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

@ -99,11 +99,11 @@ parse_css_file = {PARSE_CSS_FILE}
$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}
#'; ';
$this->imageset_keys = array( $this->imageset_keys = array(
'logos' => array( 'logos' => array(
@ -2047,9 +2047,7 @@ parse_css_file = {PARSE_CSS_FILE}
// 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'])
@ -2063,7 +2061,8 @@ parse_css_file = {PARSE_CSS_FILE}
$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(