fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix For PHP 5.4.x compatibility when PMPluginRegstry singleton is loaded from serialized file

Browse Source
This commit is contained in:
Erik Amaru Ortiz
2014-03-20 12:32:29 -04:00
parent cfeb5f1848
commit 4288d45b08
2 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
workflow/engine/classes/class.pluginRegistry.php
View File

@@ -139,6 +139,24 @@ class PMPluginRegistry
return self::$instance; return self::$instance;
} }
/**
* Load the singleton instance from a serialized stored file
*
* @param $file
* @return PMPluginRegistry
* @throws Exception
*/
public static function loadSingleton($file)
{
self::$instance = unserialize(file_get_contents($file));
if (! is_object(self::$instance) || get_class(self::$instance) != "PMPluginRegistry") {
throw new Exception("Can't load main PMPluginRegistry object.");
}
return self::$instance;
}
/** /**
* This function generates a storable representation of a value * This function generates a storable representation of a value
* param * param

9
workflow/public_html/sysGeneric.php
View File

@@ -26,8 +26,8 @@
* bootstrap - ProcessMaker Bootstrap * bootstrap - ProcessMaker Bootstrap
* this file is used initialize main variables, redirect and dispatch all requests * this file is used initialize main variables, redirect and dispatch all requests
*/ */
//session_cache_limiter('none');
//die('neyek');
function transactionLog($transactionName){ function transactionLog($transactionName){
if (extension_loaded('newrelic')) { if (extension_loaded('newrelic')) {
$baseName="ProcessMaker"; $baseName="ProcessMaker";
@@ -609,12 +609,13 @@ Bootstrap::LoadClass( 'plugin' );
//here we are loading all plugins registered //here we are loading all plugins registered
//the singleton has a list of enabled plugins //the singleton has a list of enabled plugins
$sSerializedFile = PATH_DATA_SITE . 'plugin.singleton'; $sSerializedFile = PATH_DATA_SITE . 'plugin.singleton';
$oPluginRegistry = & PMPluginRegistry::getSingleton();
if (file_exists( $sSerializedFile )) { if (file_exists( $sSerializedFile )) {
$oPluginRegistry->unSerializeInstance( file_get_contents( $sSerializedFile ) ); $oPluginRegistry = PMPluginRegistry::loadSingleton($sSerializedFile);
$attributes = $oPluginRegistry->getAttributes(); $attributes = $oPluginRegistry->getAttributes();
Bootstrap::LoadTranslationPlugins( defined( 'SYS_LANG' ) ? SYS_LANG : "en" , $attributes); Bootstrap::LoadTranslationPlugins( defined( 'SYS_LANG' ) ? SYS_LANG : "en" , $attributes);
} else{
$oPluginRegistry = PMPluginRegistry::getSingleton();
} }
// setup propel definitions and logging // setup propel definitions and logging