diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2012-02-07 16:53:47 +0100 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2012-02-07 16:53:47 +0100 |
| commit | 3feeb382c5faa00cbe69870ed7b96e927f8f59e2 (patch) | |
| tree | 1dfc8b0655f641873a974d6bbd294e0350ac1600 /phpBB/includes/functions.php | |
| parent | 508b06063fe087bb484c360b03c65637a19e31a7 (diff) | |
| parent | 326ff46ef7812f9f725e680e5202364c6b25bb4b (diff) | |
| download | forums-3feeb382c5faa00cbe69870ed7b96e927f8f59e2.tar forums-3feeb382c5faa00cbe69870ed7b96e927f8f59e2.tar.gz forums-3feeb382c5faa00cbe69870ed7b96e927f8f59e2.tar.bz2 forums-3feeb382c5faa00cbe69870ed7b96e927f8f59e2.tar.xz forums-3feeb382c5faa00cbe69870ed7b96e927f8f59e2.zip | |
Merge remote-tracking branch 'cyberalien/ticket/10616' into develop-olympus
* cyberalien/ticket/10616:
[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
Diffstat (limited to 'phpBB/includes/functions.php')
| -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; } |