Merge branch '2.3'
commit
8536a2ca80
|
@ -48,8 +48,8 @@ class PluginInstaller extends LibraryInstaller
|
|||
*/
|
||||
public function prepare($type, PackageInterface $package, PackageInterface $prevPackage = null)
|
||||
{
|
||||
// fail install process early if it going to fail due to a plugin not being allowed
|
||||
if ($type === 'install' || $type === 'update') {
|
||||
// fail install process early if it is going to fail due to a plugin not being allowed
|
||||
if (($type === 'install' || $type === 'update') && !$this->getPluginManager()->arePluginsDisabled()) {
|
||||
$this->getPluginManager()->isPluginAllowed($package->getName(), false);
|
||||
}
|
||||
|
||||
|
|
|
@ -673,6 +673,16 @@ class PluginManager
|
|||
return $rules;
|
||||
}
|
||||
|
||||
/**
|
||||
* @internal
|
||||
*
|
||||
* @return bool
|
||||
*/
|
||||
public function arePluginsDisabled()
|
||||
{
|
||||
return $this->disablePlugins;
|
||||
}
|
||||
|
||||
/**
|
||||
* @internal
|
||||
*
|
||||
|
|
Loading…
Reference in New Issue