diff --git a/front/issue.form.php b/front/issue.form.php index ef68e0019..a4d5d3c0d 100644 --- a/front/issue.form.php +++ b/front/issue.form.php @@ -53,10 +53,6 @@ Html::redirect($CFG_GLPI['root_doc']."/front/helpdesk.public.php"); } -// force layout of glpi -PluginFormcreatorCommon::saveLayout(); -$_SESSION['glpilayout'] = "lefttab"; - /** @var PluginFormcreatorIssue $issue */ $issue = PluginFormcreatorIssue::getById((int) $_REQUEST['id']); @@ -91,7 +87,6 @@ } else { Html::header($header); } - PluginFormcreatorCommon::restoreLayout(); Html::displayNotFoundError(); } @@ -100,5 +95,3 @@ } else { Html::footer(); } - -PluginFormcreatorCommon::restoreLayout(); diff --git a/inc/common.class.php b/inc/common.class.php index e0001ce3e..60f885b0f 100644 --- a/inc/common.class.php +++ b/inc/common.class.php @@ -598,14 +598,6 @@ public static function checkRegex($regex) { return $isValid; } - public static function saveLayout() { - $_SESSION['plugin_formcreator']['layout_backup'] = $_SESSION['glpilayout']; - } - - public static function restoreLayout() { - $_SESSION['glpilayout'] = $_SESSION['plugin_formcreator']['layout_backup'] ?? $_SESSION['glpilayout']; - } - /** * Find documents data matching the tags found in the string * Tags are deduplicated diff --git a/inc/issue.class.php b/inc/issue.class.php index ae8d08165..ab2e1c1b6 100644 --- a/inc/issue.class.php +++ b/inc/issue.class.php @@ -288,12 +288,10 @@ public function displayExtended($options = []) { } $itemtype = $this->fields['itemtype']; if (!class_exists($itemtype)) { - PluginFormcreatorCommon::restoreLayout(); Html::displayNotFoundError(); } $item = new $itemtype(); if (!$item->getFromDB($this->fields['items_id'])) { - PluginFormcreatorCommon::restoreLayout(); Html::displayNotFoundError(); } @@ -321,7 +319,6 @@ public function displayExtended($options = []) { $this->showNavigationHeader($options); if (!$item->canViewItem()) { - PluginFormcreatorCommon::restoreLayout(); Html::displayNotFoundError(); } @@ -337,12 +334,10 @@ public function displaySimplified($options = []) { } $itemtype = $this->fields['itemtype']; if (!class_exists($itemtype)) { - PluginFormcreatorCommon::restoreLayout(); Html::displayNotFoundError(); } $item = new $itemtype(); if (!$item->getFromDB($this->fields['items_id'])) { - PluginFormcreatorCommon::restoreLayout(); Html::displayNotFoundError(); } @@ -398,10 +393,6 @@ public function displaySimplified($options = []) { } unset($options['_item']); - // force recall of ticket in layout - PluginFormcreatorCommon::saveLayout(); - $_SESSION['glpilayout'] = "lefttab"; - if ($item instanceof Ticket) { //Tickets without form associated or single ticket for an answer $satisfaction = new TicketSatisfaction(); @@ -428,9 +419,6 @@ public function displaySimplified($options = []) { $item->showTabsContent($options); echo ''; } - - // restore layout - PluginFormcreatorCommon::restoreLayout(); } /**