aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/extension
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2016-12-20 20:27:38 +0100
committerMarc Alexander <admin@m-a-styles.de>2016-12-20 20:27:38 +0100
commit869e6a9a8827295ad004393e4fa002b79d27f8ee (patch)
tree999cd30824c1530302a393860e73adc2435bdf5b /phpBB/phpbb/extension
parent7d3300f99de3291878ca4c96a6efa6a576b20cee (diff)
parent2d742beb9245fdc215b9d53b846b15d608bd99e4 (diff)
downloadforums-869e6a9a8827295ad004393e4fa002b79d27f8ee.tar
forums-869e6a9a8827295ad004393e4fa002b79d27f8ee.tar.gz
forums-869e6a9a8827295ad004393e4fa002b79d27f8ee.tar.bz2
forums-869e6a9a8827295ad004393e4fa002b79d27f8ee.tar.xz
forums-869e6a9a8827295ad004393e4fa002b79d27f8ee.zip
Merge branch '3.1.x' into 3.2.x
Diffstat (limited to 'phpBB/phpbb/extension')
-rw-r--r--phpBB/phpbb/extension/metadata_manager.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/phpbb/extension/metadata_manager.php b/phpBB/phpbb/extension/metadata_manager.php
index fe64c92ee1..2b8b1bbd6a 100644
--- a/phpBB/phpbb/extension/metadata_manager.php
+++ b/phpBB/phpbb/extension/metadata_manager.php
@@ -102,8 +102,9 @@ class metadata_manager
return $this->metadata;
break;
+ case 'version':
case 'name':
- return ($this->validate('name')) ? $this->metadata['name'] : false;
+ return ($this->validate($element)) ? $this->metadata[$element] : false;
break;
case 'display-name':