aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUnknown Bliss <m@michaelcullum.com>2012-08-17 14:38:03 +0100
committerUnknown Bliss <m@michaelcullum.com>2012-09-01 15:05:59 +0100
commitf05a175e3955d1dc1d2b85b9929ca4b30340ad4a (patch)
tree0a932e7945eb31fe540871c7b342f81f886fc502
parent323bbf9b523984a592dc17bf35d2bb91a435be1b (diff)
downloadforums-f05a175e3955d1dc1d2b85b9929ca4b30340ad4a.tar
forums-f05a175e3955d1dc1d2b85b9929ca4b30340ad4a.tar.gz
forums-f05a175e3955d1dc1d2b85b9929ca4b30340ad4a.tar.bz2
forums-f05a175e3955d1dc1d2b85b9929ca4b30340ad4a.tar.xz
forums-f05a175e3955d1dc1d2b85b9929ca4b30340ad4a.zip
[ticket/10631] Fixing a few extension admin issues
PHPBB3-10631
-rw-r--r--phpBB/includes/extension/metadata_manager.php3
-rw-r--r--tests/extension/ext/foo/composer.json2
2 files changed, 1 insertions, 4 deletions
diff --git a/phpBB/includes/extension/metadata_manager.php b/phpBB/includes/extension/metadata_manager.php
index 1e3bbe48c9..8c570830fe 100644
--- a/phpBB/includes/extension/metadata_manager.php
+++ b/phpBB/includes/extension/metadata_manager.php
@@ -60,7 +60,6 @@ class phpbb_extension_metadata_manager
*/
public function get_metadata($element = 'all')
{
- // TODO: Check ext_name exists and is an extension that exists
$this->set_metadata_file();
// Fetch the metadata
@@ -339,7 +338,5 @@ class phpbb_extension_metadata_manager
'AUTHOR_ROLE' => (isset($author['role'])) ? htmlspecialchars($author['role']) : '',
));
}
-
- return;
}
}
diff --git a/tests/extension/ext/foo/composer.json b/tests/extension/ext/foo/composer.json
index 4b5150461f..744f7be625 100644
--- a/tests/extension/ext/foo/composer.json
+++ b/tests/extension/ext/foo/composer.json
@@ -4,7 +4,7 @@
"description": "An example/sample extension to be used for testing purposes in phpBB Development.",
"version": "1.0.0",
"time": "2012-02-15 01:01:01",
- "licence": "GNU GPL v2",
+ "licence": "GPL-2.0",
"authors": [{
"name": "Nathan Guse",
"username": "EXreaction",