makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-12 06:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/11150] Skip invalid extensions, not the whole list

Browse source 
PHPBB3-11150
This commit is contained in:
Tristan Darricau 2015-12-29 22:36:36 +01:00 • committed by Tristan Darricau
parent 5f4aa4f416
commit 1703b678d0
No known key found for this signature in database
GPG key ID: 817043C2E29DB881
2 changed files with 20 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -164,7 +164,7 @@ $lang = array_merge($lang, array(
'EXTENSIONS_REMOVED' => 'Extensions successfully removed.', 'EXTENSIONS_REMOVED' => 'Extensions successfully removed.',
'EXTENSIONS_UPDATED' => 'Extensions successfully updated.', 'EXTENSIONS_UPDATED' => 'Extensions successfully updated.',
'EXTENSIONS_COMPOSER_NOT_WRITABLE' => 'In order to use the catalog, the following files and directories must be writable: ext/ vendor-ext/ composer-ext.json and composer-ext.json.lock', 'EXTENSIONS_COMPOSER_NOT_WRITABLE' => 'In order to use the catalog, the following files and directories must be writable: ext/ vendor-ext/ composer-ext.json and composer-ext.lock',
'STABILITY_STABLE' => 'stable', 'STABILITY_STABLE' => 'stable',
'STABILITY_RC' => 'RC', 'STABILITY_RC' => 'RC',

7
phpBB/phpbb/composer/installer.php
View file

@ -454,6 +454,8 @@ class installer
//VersionParser::parseStability($version['version']) //VersionParser::parseStability($version['version'])
/** @var \Composer\Package\PackageInterface $version */ /** @var \Composer\Package\PackageInterface $version */
foreach ($versions as $version) foreach ($versions as $version)
{
try
{ {
if (BasePackage::$stabilities[$version->getStability()] > $core_stability_value) if (BasePackage::$stabilities[$version->getStability()] > $core_stability_value)
{ {
@ -473,6 +475,11 @@ class installer
$compatible_packages[$package_name][] = $version; $compatible_packages[$package_name][] = $version;
} }
catch (\Exception $e)
{
// Do nothing (to log when a true debug logger is available)
}
}
return $compatible_packages; return $compatible_packages;
} }