diff options
| author | David King <imkingdavid@gmail.com> | 2013-10-04 15:40:20 -0700 |
|---|---|---|
| committer | David King <imkingdavid@gmail.com> | 2013-10-04 15:40:20 -0700 |
| commit | 82b9df543b8bebd30b02e2ad9d0731c80fb6d19c (patch) | |
| tree | dc3c65218606daaabcf3f7d613eb542db83348a4 /phpBB/phpbb | |
| parent | e8c7f8134df38708e1af27325d2c8a7b9f28052e (diff) | |
| parent | b931b0b35b73cb19d5d483dabf8628188feb9deb (diff) | |
| download | forums-82b9df543b8bebd30b02e2ad9d0731c80fb6d19c.tar forums-82b9df543b8bebd30b02e2ad9d0731c80fb6d19c.tar.gz forums-82b9df543b8bebd30b02e2ad9d0731c80fb6d19c.tar.bz2 forums-82b9df543b8bebd30b02e2ad9d0731c80fb6d19c.tar.xz forums-82b9df543b8bebd30b02e2ad9d0731c80fb6d19c.zip | |
Merge pull request #1742 from EXreaction/ticket/11840
Ticket/11840 Refactor the extension metadata class
Diffstat (limited to 'phpBB/phpbb')
| -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..19c6288e96 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']) : '', |