Merged in bugfix/HOR-4284 (pull request #6325)

HOR-4284

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
This commit is contained in:
Roly
2018-01-25 19:54:13 +00:00
committed by Julio Cesar Laura Avendaño
2 changed files with 8 additions and 1 deletions

View File

@@ -174,6 +174,8 @@ class PluginRegistry
$Plugin = new $className($pluginDetail->getNamespace(), $pluginDetail->getFile());
$this->_aPlugins[$pluginDetail->getNamespace()] = $Plugin;
$iPlugins++;
$Plugin->registerPmFunction();
$this->init();
$Plugin->setup();
}
}
@@ -482,6 +484,9 @@ class PluginRegistry
$className = $detail->getClassName();
/** @var enterprisePlugin $oPlugin */
$oPlugin = new $className($detail->getNamespace(), $detail->getFile());
$oPlugin->registerPmFunction();
$detail->setEnabled(true);
$this->init();
$oPlugin->setup();
$this->_aPlugins[$detail->getNamespace()] = $oPlugin;
$oPlugin->install();

View File

@@ -696,7 +696,9 @@ if (defined( 'DEBUG_SQL_LOG' ) && DEBUG_SQL_LOG) {
//the singleton has a list of enabled plugins
$oPluginRegistry = PluginRegistry::loadSingleton();
$attributes = $oPluginRegistry->getAttributes();
Bootstrap::LoadTranslationPlugins( defined( 'SYS_LANG' ) ? SYS_LANG : "en" , $attributes);
Bootstrap::LoadTranslationPlugins(defined('SYS_LANG') ? SYS_LANG : "en", $attributes);
// Initialization functions plugins
$oPluginRegistry->init();
//Set Time Zone
/*----------------------------------********---------------------------------*/