diff options
| author | Vjacheslav Trushkin <arty@phpbb.com> | 2012-02-03 16:09:48 +0200 |
|---|---|---|
| committer | Vjacheslav Trushkin <arty@phpbb.com> | 2012-02-03 16:09:48 +0200 |
| commit | 4aef6ea979befe9c40b3253ed10678a4eeb74160 (patch) | |
| tree | b27d363e5a51cfe5a5735067af265a9d9618b177 /phpBB | |
| parent | d2a34961498a03b77885af6a20497e87d36ad7ef (diff) | |
| download | forums-4aef6ea979befe9c40b3253ed10678a4eeb74160.tar forums-4aef6ea979befe9c40b3253ed10678a4eeb74160.tar.gz forums-4aef6ea979befe9c40b3253ed10678a4eeb74160.tar.bz2 forums-4aef6ea979befe9c40b3253ed10678a4eeb74160.tar.xz forums-4aef6ea979befe9c40b3253ed10678a4eeb74160.zip | |
[ticket/10616] Ignore template inheritance that points to self
Ignore template inheritance if it points to self
PHPBB3-10616
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/functions.php | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 1eefaee651..4d2a00f2db 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -3322,6 +3322,11 @@ function parse_cfg_file($filename, $lines = false) $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; } |