1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-11 19:24:01 +02:00

[ticket/12311] Use valid composer schema - license - for extensions

http://tracker.phpbb.com/browse/PHPBB3-12311

PHPBB3-12311
This commit is contained in:
Matt Friedman
2014-03-27 23:27:30 -07:00
parent c256d7a88d
commit ba9bc9c7dc
10 changed files with 17 additions and 17 deletions

View File

@@ -41,8 +41,8 @@
</dl>
<!-- ENDIF -->
<dl>
<dt><label>{L_LICENCE}{L_COLON}</label></dt>
<dd><span id="meta_license">{META_LICENCE}</span></dd>
<dt><label>{L_LICENSE}{L_COLON}</label></dt>
<dd><span id="meta_license">{META_LICENSE}</span></dd>
</dl>
</fieldset>

View File

@@ -96,7 +96,7 @@ $lang = array_merge($lang, array(
'HOMEPAGE' => 'Homepage',
'PATH' => 'File Path',
'TIME' => 'Release Time',
'LICENCE' => 'Licence',
'LICENSE' => 'License',
'REQUIREMENTS' => 'Requirements',
'PHPBB_VERSION' => 'phpBB Version',

View File

@@ -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(),