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