diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2012-02-07 16:57:09 +0100 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2012-02-07 16:57:09 +0100 |
| commit | d4e00b6c0dd75c757797a0fc8bc30e9b8672e094 (patch) | |
| tree | a8127689e83019fc5ea097252eb6b131f7440860 /phpBB/includes/functions.php | |
| parent | 2929d345ab93e4814d3880313f6ea78cb30fabe6 (diff) | |
| parent | 3feeb382c5faa00cbe69870ed7b96e927f8f59e2 (diff) | |
| download | forums-d4e00b6c0dd75c757797a0fc8bc30e9b8672e094.tar forums-d4e00b6c0dd75c757797a0fc8bc30e9b8672e094.tar.gz forums-d4e00b6c0dd75c757797a0fc8bc30e9b8672e094.tar.bz2 forums-d4e00b6c0dd75c757797a0fc8bc30e9b8672e094.tar.xz forums-d4e00b6c0dd75c757797a0fc8bc30e9b8672e094.zip | |
Merge branch 'develop-olympus' into develop
* 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
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 a60edb5cee..bbd9bc4554 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -3091,6 +3091,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; } |