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

Merge remote-tracking branch 'origin/bugfix/HOR-3670' into release/3.2.2

Browse Source
This commit is contained in:
David Callizaya
2017-08-15 10:07:12 -04:00
parent 98289a5cb0 c070a9b0bb
commit d25346e06e
326 changed files with 11383 additions and 24998 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
gulliver/system/class.bootstrap.php
View File

@@ -1,4 +1,7 @@
<?php
use ProcessMaker\Core\System;
/**
* class.bootstrap.php
*
@@ -41,7 +44,7 @@ class Bootstrap
public static function getSystemConfiguration($globalIniFile = '', $wsIniFile = '', $wsName = '')
{
return PmSystem::getSystemConfiguration($globalIniFile, $wsIniFile, $wsName);
return System::getSystemConfiguration($globalIniFile, $wsIniFile, $wsName);
}
/**
* @deprecated 3.2.2, We keep this function only for backwards compatibility because is used in the plugin manager
@@ -919,7 +922,7 @@ class Bootstrap
if (((in_array($browserName, $enabledBrowsers)) || (in_array('ALL', $enabledBrowsers))) && (!(in_array($browserName, $disabledBrowsers)))) {
if ($cssFileInfo['__ATTRIBUTES__']['file'] == 'rtl.css') {
$oServerConf = & serverConf::getSingleton();
$oServerConf = & ServerConf::getSingleton();
if (!(defined('SYS_LANG'))) {
if (isset($_SERVER['HTTP_REFERER'])) {
$syss = explode('://', $_SERVER['HTTP_REFERER']);
@@ -1030,7 +1033,7 @@ class Bootstrap
*/
public function getCheckSum($files)
{
$key = PmSystem::getVersion();
$key = System::getVersion();
if (!is_array($files)) {
$tmp = $files;
@@ -1923,7 +1926,7 @@ class Bootstrap
/* Fix to prevent use uxs skin outside siplified interface,
because that skin is not compatible with others interfaces */
if ($args['SYS_SKIN'] == 'uxs' && $args['SYS_COLLECTION'] != 'home' && $args['SYS_COLLECTION'] != 'cases') {
$config = PmSystem::getSystemConfiguration();
$config = System::getSystemConfiguration();
$args['SYS_SKIN'] = $config['default_skin'];
}