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

fix in login and pluginregistry

Browse Source
This commit is contained in:
dev-ronald
2017-07-24 16:29:18 -04:00
committed by Ronald Quenta
parent 0fb5b39664
commit dc7abaae6b
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gulliver/system/class.headPublisher.php
View File

@@ -551,7 +551,7 @@ class headPublisher
$this->extJsScript[] = '/extjs/' . $cacheName; $this->extJsScript[] = '/extjs/' . $cacheName;
//hook for registered javascripts from plugins //hook for registered javascripts from plugins
if (class_exists('PMPluginRegistry') && defined('SYS_SYS')) { if (class_exists('ProcessMaker\Plugins\PluginRegistry') && defined('SYS_SYS')) {
$oPluginRegistry = \ProcessMaker\Plugins\PluginRegistry::loadSingleton(); $oPluginRegistry = \ProcessMaker\Plugins\PluginRegistry::loadSingleton();
$pluginJavascripts = $oPluginRegistry->getRegisteredJavascriptBy($filename); $pluginJavascripts = $oPluginRegistry->getRegisteredJavascriptBy($filename);
} else { } else {

2
workflow/engine/skinEngine/skinEngine.php
View File

@@ -792,7 +792,7 @@ class SkinEngine
$sWspaceSelect = trim($aFotoSelect['WORKSPACE_LOGO_NAME']); $sWspaceSelect = trim($aFotoSelect['WORKSPACE_LOGO_NAME']);
} }
} }
if (class_exists('PMPluginRegistry') && defined("SYS_SYS")) { if (class_exists('ProcessMaker\Plugins\PluginRegistry') && defined("SYS_SYS")) {
$oPluginRegistry = PluginRegistry::loadSingleton(); $oPluginRegistry = PluginRegistry::loadSingleton();
if ( isset($sFotoSelect) && $sFotoSelect!='' && !(strcmp($sWspaceSelect, SYS_SYS)) ){ if ( isset($sFotoSelect) && $sFotoSelect!='' && !(strcmp($sWspaceSelect, SYS_SYS)) ){
$sCompanyLogo = $oPluginRegistry->getCompanyLogo($sFotoSelect); $sCompanyLogo = $oPluginRegistry->getCompanyLogo($sFotoSelect);