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

HOR-2101-B

Browse Source
This commit is contained in:
Luis Fernando Saisa Lopez
2016-11-22 11:47:41 -05:00
parent 7cfb651d98
commit ca0af8f9dd
3 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
workflow/engine/classes/class.system.php
View File

@@ -75,7 +75,8 @@ class System
'enable_blacklist' => 0, 'enable_blacklist' => 0,
'system_utc_time_zone' => 0, 'system_utc_time_zone' => 0,
'server_protocol' => '', 'server_protocol' => '',
'server_hostname_requests_frontend' => '' 'server_hostname_requests_frontend' => '',
'load_headers_ie' => 0
); );
/** /**
@@ -1281,4 +1282,3 @@ class System
} }
} }
// end System class // end System class

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

@@ -310,7 +310,11 @@ class SkinEngine
} }
$template->assign("doctype", $doctype); $template->assign("doctype", $doctype);
$template->assign("meta", $meta);
if (defined('LOAD_HEADERS_IE') && LOAD_HEADERS_IE == 0) {
$template->assign('meta', $meta);
}
$template->assign("dirBody", $dirBody); $template->assign("dirBody", $dirBody);
echo $template->getOutputContent(); echo $template->getOutputContent();
@@ -693,7 +697,10 @@ class SkinEngine
$header .= $oHeadPublisher->getExtJsStylesheets($this->cssFileName); $header .= $oHeadPublisher->getExtJsStylesheets($this->cssFileName);
} }
$smarty->assign("meta", $meta); if (defined('LOAD_HEADERS_IE') && LOAD_HEADERS_IE == 0) {
$smarty->assign('meta', $meta);
}
$smarty->assign("header", $header); $smarty->assign("header", $header);
$footer = ''; $footer = '';

2
workflow/public_html/sysGeneric.php
View File

@@ -339,6 +339,8 @@ define( 'MEMCACHED_SERVER', $config['memcached_server'] );
define ('WS_IN_LOGIN', isset($config['WS_IN_LOGIN']) ? $config['WS_IN_LOGIN'] : 'serverconf'); define ('WS_IN_LOGIN', isset($config['WS_IN_LOGIN']) ? $config['WS_IN_LOGIN'] : 'serverconf');
define('LOAD_HEADERS_IE', $config['load_headers_ie']);
// IIS Compatibility, SERVER_ADDR doesn't exist on that env, so we need to define it. // IIS Compatibility, SERVER_ADDR doesn't exist on that env, so we need to define it.
$_SERVER['SERVER_ADDR'] = isset( $_SERVER['SERVER_ADDR'] ) ? $_SERVER['SERVER_ADDR'] : $_SERVER['SERVER_NAME']; $_SERVER['SERVER_ADDR'] = isset( $_SERVER['SERVER_ADDR'] ) ? $_SERVER['SERVER_ADDR'] : $_SERVER['SERVER_NAME'];