HOR-3502 HOR-2043
This commit is contained in:
committed by
Ronald Quenta
parent
a500ec3ea1
commit
519e9e477f
@@ -638,17 +638,6 @@ $memcache = & PMmemcached::getSingleton( SYS_SYS );
|
||||
|
||||
// load Plugins base class
|
||||
|
||||
//here we are loading all plugins registered
|
||||
//the singleton has a list of enabled plugins
|
||||
$sSerializedFile = PATH_DATA_SITE . 'plugin.singleton';
|
||||
|
||||
if (file_exists( $sSerializedFile )) {
|
||||
$oPluginRegistry = PMPluginRegistry::loadSingleton($sSerializedFile);
|
||||
$attributes = $oPluginRegistry->getAttributes();
|
||||
Bootstrap::LoadTranslationPlugins( defined( 'SYS_LANG' ) ? SYS_LANG : "en" , $attributes);
|
||||
} else{
|
||||
$oPluginRegistry = PMPluginRegistry::getSingleton();
|
||||
}
|
||||
// setup propel definitions and logging
|
||||
//changed to autoloader
|
||||
//require_once ("propel/Propel.php");
|
||||
@@ -689,6 +678,17 @@ if (defined( 'DEBUG_SQL_LOG' ) && DEBUG_SQL_LOG) {
|
||||
Propel::init( PATH_CORE . "config/databases.php" );
|
||||
}
|
||||
|
||||
//here we are loading all plugins registered
|
||||
//the singleton has a list of enabled plugins
|
||||
$sSerializedFile = PATH_DATA_SITE . 'plugin.singleton';
|
||||
$oPluginRegistry = &ProcessMaker\Plugins\PluginsRegistry::loadSingleton();
|
||||
$attributes = $oPluginRegistry->getAttributes();
|
||||
Bootstrap::LoadTranslationPlugins( defined( 'SYS_LANG' ) ? SYS_LANG : "en" , $attributes);
|
||||
|
||||
// Setup plugins
|
||||
$avoidChangedWorkspaceValidation = false;
|
||||
$oPluginRegistry->setupPlugins(); //get and setup enabled plugins
|
||||
|
||||
//Set Time Zone
|
||||
/*----------------------------------********---------------------------------*/
|
||||
$_SESSION['__SYSTEM_UTC_TIME_ZONE__'] = (int)($config['system_utc_time_zone']) == 1;
|
||||
@@ -740,9 +740,7 @@ if (SYS_LANG != 'en' && ! is_file( PATH_LANGUAGECONT . 'translation.' . SYS_LANG
|
||||
Bootstrap::LoadTranslationObject(SYS_LANG);
|
||||
}
|
||||
|
||||
// Setup plugins
|
||||
$oPluginRegistry->setupPlugins(); //get and setup enabled plugins
|
||||
$avoidChangedWorkspaceValidation = false;
|
||||
|
||||
|
||||
// Load custom Classes and Model from Plugins.
|
||||
Bootstrap::LoadAllPluginModelClasses();
|
||||
|
||||
Reference in New Issue
Block a user