BUG 6893 restore previous commit
This commit is contained in:
@@ -47,7 +47,7 @@ try {//ini_set('display_errors','1');
|
|||||||
$oConf = new Configurations;
|
$oConf = new Configurations;
|
||||||
$aConf = Array(
|
$aConf = Array(
|
||||||
'WORKSPACE_LOGO_NAME' => SYS_SYS,
|
'WORKSPACE_LOGO_NAME' => SYS_SYS,
|
||||||
'DEFAULT_LOGO_NAME' => base64_encode($snameLogo)
|
'DEFAULT_LOGO_NAME' => $snameLogo
|
||||||
);
|
);
|
||||||
|
|
||||||
$oConf->aConfig = $aConf;
|
$oConf->aConfig = $aConf;
|
||||||
|
|||||||
@@ -480,7 +480,7 @@ if (isset($G_ENABLE_BLANK_SKIN) && $G_ENABLE_BLANK_SKIN) {
|
|||||||
$oPluginRegistry = &PMPluginRegistry::getSingleton();
|
$oPluginRegistry = &PMPluginRegistry::getSingleton();
|
||||||
if ( isset($sFotoSelect) && $sFotoSelect!='' && !(strcmp($sWspaceSelect,SYS_SYS)) ){
|
if ( isset($sFotoSelect) && $sFotoSelect!='' && !(strcmp($sWspaceSelect,SYS_SYS)) ){
|
||||||
$sCompanyLogo = $oPluginRegistry->getCompanyLogo($sFotoSelect);
|
$sCompanyLogo = $oPluginRegistry->getCompanyLogo($sFotoSelect);
|
||||||
$sCompanyLogo= "/sys".SYS_SYS."/".SYS_LANG."/".SYS_SKIN."/setup/showLogoFile.php?id=".G::encrypt(base64_decode($sCompanyLogo),"imagen");
|
$sCompanyLogo= "/sys".SYS_SYS."/".SYS_LANG."/".SYS_SKIN."/setup/showLogoFile.php?id=".G::encrypt($sCompanyLogo,"imagen");
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
$sCompanyLogo = $oPluginRegistry->getCompanyLogo('/images/processmaker.logo.jpg');
|
$sCompanyLogo = $oPluginRegistry->getCompanyLogo('/images/processmaker.logo.jpg');
|
||||||
|
|||||||
Reference in New Issue
Block a user