From b5715fb4a82d6494e6fba5ffcc1b0af3c9d2421c Mon Sep 17 00:00:00 2001 From: cfoe <cfoe@ispconfig3> Date: Sat, 07 Jul 2012 13:12:41 -0400 Subject: [PATCH] removed hardcoded width for list search_limit select-element -> css defined --- interface/lib/classes/tform_actions.inc.php | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/interface/lib/classes/tform_actions.inc.php b/interface/lib/classes/tform_actions.inc.php index f1978ff..39cdb49 100644 --- a/interface/lib/classes/tform_actions.inc.php +++ b/interface/lib/classes/tform_actions.inc.php @@ -139,7 +139,7 @@ session_write_close(); header($redirect); // When a returnto variable is set - } elseif ($_SESSION["s"]["form"]["return_to_url"] != '') { + } elseif (isset($_SESSION["s"]["form"]["return_to_url"]) && $_SESSION["s"]["form"]["return_to_url"] != '') { $redirect = $_SESSION["s"]["form"]["return_to_url"]; $_SESSION["s"]["form"]["return_to_url"] = ''; session_write_close(); @@ -216,9 +216,10 @@ header($redirect); exit; } elseif ($_SESSION["s"]["form"]["return_to_url"] != '') { + $redirect = $_SESSION["s"]["form"]["return_to_url"]; $_SESSION["s"]["form"]["return_to_url"] = ''; session_write_close(); - header("Location: ".$_SESSION["s"]["form"]["return_to_url"]); + header("Location: ".$redirect); exit; } else { header("Location: ".$app->tform->formDef['list_default']); @@ -315,7 +316,7 @@ $next_tab = $app->tform->getCurrentTab(); $this->loadPlugins($next_tab); - + // Call plugin foreach($this->plugins as $plugin) { $plugin->onDelete(); @@ -537,7 +538,7 @@ if(!$record = $app->db->queryOneRecord($sql)) $app->error($app->lng('error_no_view_permission')); } else { // $record = $app->tform->encode($_POST,$this->active_tab); - $record = $app->tform->encode($this->dataRecord,$this->active_tab); + $record = $app->tform->encode($this->dataRecord,$this->active_tab,false); } $this->dataRecord = $record; -- Gitblit v1.9.1