diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2014-07-03 14:24:47 +0200 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2014-07-03 14:24:47 +0200 |
| commit | 05bd866cb3e0938c034bff45014c4cb3c760dcd9 (patch) | |
| tree | d86021aca6c5619c22a9df66b01144bd8cdc12d6 /phpBB/phpbb/extension | |
| parent | df38b2829a60a0353a2c9f46646f71d11446ff9f (diff) | |
| parent | 0232fcc22ac8e5e7ba916db9049a903f53788421 (diff) | |
| download | forums-05bd866cb3e0938c034bff45014c4cb3c760dcd9.tar forums-05bd866cb3e0938c034bff45014c4cb3c760dcd9.tar.gz forums-05bd866cb3e0938c034bff45014c4cb3c760dcd9.tar.bz2 forums-05bd866cb3e0938c034bff45014c4cb3c760dcd9.tar.xz forums-05bd866cb3e0938c034bff45014c4cb3c760dcd9.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/12783] Move phpbb requirement to extra->soft-require
[ticket/12783] Correctly use dataProviders and mark tests as incomplete
[ticket/12783] Move phpbb/phpbb require version to extra
Diffstat (limited to 'phpBB/phpbb/extension')
| -rw-r--r-- | phpBB/phpbb/extension/metadata_manager.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/phpbb/extension/metadata_manager.php b/phpBB/phpbb/extension/metadata_manager.php index 014d8c79c7..1051021ea7 100644 --- a/phpBB/phpbb/extension/metadata_manager.php +++ b/phpBB/phpbb/extension/metadata_manager.php @@ -306,7 +306,7 @@ class metadata_manager */ public function validate_require_phpbb() { - if (!isset($this->metadata['require']['phpbb/phpbb'])) + if (!isset($this->metadata['extra']['soft-require']['phpbb/phpbb'])) { return false; } @@ -369,7 +369,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/phpbb'])) ? htmlspecialchars($this->metadata['require']['phpbb/phpbb']) : '', + 'META_REQUIRE_PHPBB' => (isset($this->metadata['extra']['soft-require']['phpbb/phpbb'])) ? htmlspecialchars($this->metadata['extra']['soft-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']) : '', |