diff --git a/workflow/engine/classes/class.system.php b/workflow/engine/classes/class.system.php index 582c88ed3..ea9aa11e5 100644 --- a/workflow/engine/classes/class.system.php +++ b/workflow/engine/classes/class.system.php @@ -75,7 +75,8 @@ class System 'enable_blacklist' => 0, 'system_utc_time_zone' => 0, 'server_protocol' => '', - 'server_hostname_requests_frontend' => '' + 'server_hostname_requests_frontend' => '', + 'load_headers_ie' => 0 ); /** @@ -1281,4 +1282,3 @@ class System } } // end System class - diff --git a/workflow/engine/skinEngine/skinEngine.php b/workflow/engine/skinEngine/skinEngine.php index 377bae99b..278534637 100644 --- a/workflow/engine/skinEngine/skinEngine.php +++ b/workflow/engine/skinEngine/skinEngine.php @@ -310,7 +310,11 @@ class SkinEngine } $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); echo $template->getOutputContent(); @@ -693,7 +697,10 @@ class SkinEngine $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); $footer = ''; diff --git a/workflow/public_html/sysGeneric.php b/workflow/public_html/sysGeneric.php index 12281c261..14de9448a 100644 --- a/workflow/public_html/sysGeneric.php +++ b/workflow/public_html/sysGeneric.php @@ -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('LOAD_HEADERS_IE', $config['load_headers_ie']); + // 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'];