diff --git a/workflow/engine/methods/cases/casesConsolidatedListExtJs.php b/workflow/engine/methods/cases/casesConsolidatedListExtJs.php index 173112538..d01de5fce 100644 --- a/workflow/engine/methods/cases/casesConsolidatedListExtJs.php +++ b/workflow/engine/methods/cases/casesConsolidatedListExtJs.php @@ -178,6 +178,12 @@ if (count($arrayTabItem) > 0) { $headPublisher->assign("FORMATS", $conf->getFormats()); $headPublisher->assign("urlProxy", $urlProxy); $headPublisher->assign('credentials', $clientToken ); + + $ieVersion = null; + if(preg_match("/^.*\(.*MSIE (\d+)\..+\).*$/", $_SERVER["HTTP_USER_AGENT"], $arrayMatch) || preg_match("/^.*\(.*rv.(\d+)\..+\).*$/", $_SERVER["HTTP_USER_AGENT"], $arrayMatch)){ + $ieVersion = intval($arrayMatch[1]); + } + $oHeadPublisher->assign( 'ieVersion', $ieVersion ); $headPublisher->addExtJsScript("app/main", true); $headPublisher->addExtJsScript("cases/casesListConsolidated", false); //Adding a JavaScript file .js diff --git a/workflow/engine/methods/cases/cases_Derivate.php b/workflow/engine/methods/cases/cases_Derivate.php index b9f89784d..6db8481f5 100755 --- a/workflow/engine/methods/cases/cases_Derivate.php +++ b/workflow/engine/methods/cases/cases_Derivate.php @@ -187,7 +187,12 @@ try { $loc = $aNextStep['PAGE']; } //Triggers After - if (isset( $_SESSION['TRIGGER_DEBUG']['ISSET'] )) { + $ieVersion = null; + if(preg_match("/^.*\(.*MSIE (\d+)\..+\).*$/", $_SERVER["HTTP_USER_AGENT"], $arrayMatch) || preg_match("/^.*\(.*rv.(\d+)\..+\).*$/", $_SERVER["HTTP_USER_AGENT"], $arrayMatch)){ + $ieVersion = intval($arrayMatch[1]); + } + + if (isset( $_SESSION['TRIGGER_DEBUG']['ISSET'] ) && $ieVersion != 11) { if ($_SESSION['TRIGGER_DEBUG']['ISSET'] == 1) { $oTemplatePower = new TemplatePower( PATH_TPL . 'cases/cases_Step.html' ); $oTemplatePower->prepare(); @@ -205,10 +210,7 @@ try { } //close tab only if IE11 - $ieVersion = null; - if(preg_match("/^.*\(.*MSIE (\d+)\..+\).*$/", $_SERVER["HTTP_USER_AGENT"], $arrayMatch) || preg_match("/^.*\(.*rv.(\d+)\..+\).*$/", $_SERVER["HTTP_USER_AGENT"], $arrayMatch)){ - $ieVersion = intval($arrayMatch[1]); - } + if($ieVersion == 11 && !isset($_SESSION['__OUTLOOK_CONNECTOR__'])) { $script = "