release/3.2.2 to develop conflicts
This commit is contained in:
@@ -1102,8 +1102,9 @@ class PMPluginRegistry
|
||||
{
|
||||
try {
|
||||
$iPlugins = 0;
|
||||
$oServerConf = &ServerConf::getSingleton();
|
||||
$oServerConf->addPlugin(SYS_SYS, $this->_aPluginDetails);
|
||||
|
||||
$oServerConf = & ServerConf::getSingleton();
|
||||
$oServerConf->addPlugin( config("system.workspace"), $this->_aPluginDetails );
|
||||
foreach ($this->_aPluginDetails as $namespace => $detail) {
|
||||
if (isset($detail->enabled) && $detail->enabled) {
|
||||
if (!empty($detail->sFilename) && file_exists($detail->sFilename)) {
|
||||
|
||||
Reference in New Issue
Block a user