diff options
| author | MichaelC <m@michaelcullum.com> | 2013-09-18 09:06:16 +0100 |
|---|---|---|
| committer | MichaelC <m@michaelcullum.com> | 2013-10-01 00:35:36 +0100 |
| commit | fd022123c074463f0f82c884cf9821367b530e46 (patch) | |
| tree | 71b0119f91e311750fb4c07919abe76400fca4cf /phpBB/phpbb/extension/metadata_manager.php | |
| parent | 179f41475b555d0a3314d779d0d7423f66f0fb95 (diff) | |
| download | forums-fd022123c074463f0f82c884cf9821367b530e46.tar forums-fd022123c074463f0f82c884cf9821367b530e46.tar.gz forums-fd022123c074463f0f82c884cf9821367b530e46.tar.bz2 forums-fd022123c074463f0f82c884cf9821367b530e46.tar.xz forums-fd022123c074463f0f82c884cf9821367b530e46.zip | |
[task/composer-compatibility] Minor changes that will break extension BC
PHPBB3-11840
Diffstat (limited to 'phpBB/phpbb/extension/metadata_manager.php')
| -rw-r--r-- | phpBB/phpbb/extension/metadata_manager.php | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/phpBB/phpbb/extension/metadata_manager.php b/phpBB/phpbb/extension/metadata_manager.php index a77f3a2c6e..1b62194956 100644 --- a/phpBB/phpbb/extension/metadata_manager.php +++ b/phpBB/phpbb/extension/metadata_manager.php @@ -203,7 +203,7 @@ class metadata_manager // Basic fields $fields = array( 'name' => '#^[a-zA-Z0-9_\x7f-\xff]{2,}/[a-zA-Z0-9_\x7f-\xff]{2,}$#', - 'type' => '#^phpbb3-extension$#', + 'type' => 'phpbb-extension', 'licence' => '#.+#', 'version' => '#.+#', ); @@ -291,12 +291,12 @@ class metadata_manager */ public function validate_require_phpbb() { - if (!isset($this->metadata['require']['phpbb'])) + if (!isset($this->metadata['require']['phpbb/phpbb'])) { - return true; + return false; } - return $this->_validate_version($this->metadata['require']['phpbb'], $this->config['version']); + return true; } /** @@ -308,10 +308,10 @@ class metadata_manager { if (!isset($this->metadata['require']['php'])) { - return true; + return false; } - return $this->_validate_version($this->metadata['require']['php'], phpversion()); + return true; } /** @@ -354,7 +354,7 @@ class metadata_manager 'META_REQUIRE_PHP' => (isset($this->metadata['require']['php'])) ? htmlspecialchars($this->metadata['require']['php']) : '', 'META_REQUIRE_PHP_FAIL' => !$this->validate_require_php(), - 'META_REQUIRE_PHPBB' => (isset($this->metadata['require']['phpbb'])) ? htmlspecialchars($this->metadata['require']['phpbb']) : '', + 'META_REQUIRE_PHPBB' => (isset($this->metadata['require']['phpbb/phpbb'])) ? htmlspecialchars($this->metadata['require']['phpbb/phpbb']) : '', 'META_REQUIRE_PHPBB_FAIL' => !$this->validate_require_phpbb(), 'META_DISPLAY_NAME' => (isset($this->metadata['extra']['display-name'])) ? htmlspecialchars($this->metadata['extra']['display-name']) : '', |