aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
diff options
context:
space:
mode:
authorMatt Friedman <maf675@gmail.com>2014-03-27 23:27:30 -0700
committerMatt Friedman <maf675@gmail.com>2014-03-27 23:27:30 -0700
commitba9bc9c7dc24e8c21f0c22c9e872214094d94425 (patch)
tree9b950c2094dce5692602b1c138d0d15d9ae579cd /phpBB/phpbb
parentc256d7a88d617116e540fb4881605375f4f3e307 (diff)
downloadforums-ba9bc9c7dc24e8c21f0c22c9e872214094d94425.tar
forums-ba9bc9c7dc24e8c21f0c22c9e872214094d94425.tar.gz
forums-ba9bc9c7dc24e8c21f0c22c9e872214094d94425.tar.bz2
forums-ba9bc9c7dc24e8c21f0c22c9e872214094d94425.tar.xz
forums-ba9bc9c7dc24e8c21f0c22c9e872214094d94425.zip
[ticket/12311] Use valid composer schema - license - for extensions
http://tracker.phpbb.com/browse/PHPBB3-12311 PHPBB3-12311
Diffstat (limited to 'phpBB/phpbb')
-rw-r--r--phpBB/phpbb/extension/metadata_manager.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/phpbb/extension/metadata_manager.php b/phpBB/phpbb/extension/metadata_manager.php
index 66cdb86513..c90445ee09 100644
--- a/phpBB/phpbb/extension/metadata_manager.php
+++ b/phpBB/phpbb/extension/metadata_manager.php
@@ -196,7 +196,7 @@ class metadata_manager
$fields = array(
'name' => '#^[a-zA-Z0-9_\x7f-\xff]{2,}/[a-zA-Z0-9_\x7f-\xff]{2,}$#',
'type' => '#^phpbb-extension$#',
- 'licence' => '#.+#',
+ 'license' => '#.+#',
'version' => '#.+#',
);
@@ -351,7 +351,7 @@ class metadata_manager
'META_HOMEPAGE' => (isset($this->metadata['homepage'])) ? $this->metadata['homepage'] : '',
'META_VERSION' => (isset($this->metadata['version'])) ? htmlspecialchars($this->metadata['version']) : '',
'META_TIME' => (isset($this->metadata['time'])) ? htmlspecialchars($this->metadata['time']) : '',
- 'META_LICENCE' => htmlspecialchars($this->metadata['licence']),
+ 'META_LICENSE' => htmlspecialchars($this->metadata['license']),
'META_REQUIRE_PHP' => (isset($this->metadata['require']['php'])) ? htmlspecialchars($this->metadata['require']['php']) : '',
'META_REQUIRE_PHP_FAIL' => !$this->validate_require_php(),