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

Merged in bugfix/HOR-4232 (pull request #6286)

Browse Source 
HOR-4232

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
This commit is contained in:
Marco Antonio Nina Mena
2018-01-15 15:43:03 +00:00
committed by Julio Cesar Laura Avendaño
parent ccf97ba1dc 14f36077c8
commit 6d12229fa3
2 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
workflow/engine/bin/tasks/cliUpgrade.php
View File

@@ -157,6 +157,11 @@ function run_upgrade($command, $args)
} }
} }
//Verify the information of the singleton ServConf by changing the name of the class if is required.
CLI::logging("\nCheck/Fix serialized instance in serverConf.singleton file\n\n");
$serverConf = ServerConf::getSingleton();
$serverConf->updateClassNameInFile();
// SAVE Upgrades/Patches // SAVE Upgrades/Patches
$arrayPatch = glob(PATH_TRUNK . 'patch-*'); $arrayPatch = glob(PATH_TRUNK . 'patch-*');

13
workflow/engine/classes/ServerConf.php
View File

@@ -484,4 +484,17 @@ class ServerConf
$lang = substr($lang, 0, 2); $lang = substr($lang, 0, 2);
return in_array($lang, $this->rtlLang); return in_array($lang, $this->rtlLang);
} }
/**
* Change class name from "serverConf" to "ServerConf" for previous versions to 3.2.2
*/
public function updateClassNameInFile()
{
if (file_exists(self::$instance->filePath) && filesize(self::$instance->filePath) > 0) {
$file = file_get_contents(self::$instance->filePath);
$file = str_replace('serverConf', self::class, $file);
self::$instance->unSerializeInstance($file);
$this->saveSingleton();
}
}
} }