mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'vsephpbb/ticket/12311' into develop-ascraeus

Browse Source 
* vsephpbb/ticket/12311:
  [ticket/12311] Use British-English spelling of licence in lang file
  [ticket/12311] Use valid composer schema - license - for extensions
This commit is contained in:
Joas Schilling
2014-03-28 17:29:56 +01:00
parent 968da05e51 368dd23d4b
commit ce6e3966cf
10 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
phpBB/adm/style/acp_ext_details.html
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>

2
phpBB/language/en/acp/extensions.php
View File

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

4
phpBB/phpbb/extension/metadata_manager.php
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(),