diff --git a/include/action.inc.php b/include/action.inc.php index 70406bb75..e27e5f192 100644 --- a/include/action.inc.php +++ b/include/action.inc.php @@ -55,8 +55,7 @@ $sub_action=$http->request("sa","string",""); */ $ag_id=$http->request("ag_id","string","0"); -$ac=$http->request("ac"); -$base=HtmlInput::request_to_string(array('ac','gDossier'),""); +$base="do.php?".http_build_query(["ac"=>$http->request("ac"),"gDossier"=>Dossier::id()]); echo '
'; require_once NOALYSS_INCLUDE.'/action.common.inc.php'; echo "
"; diff --git a/include/class/follow_up.class.php b/include/class/follow_up.class.php index b04bc903e..e24b46e97 100644 --- a/include/class/follow_up.class.php +++ b/include/class/follow_up.class.php @@ -610,7 +610,8 @@ class Follow_Up function myList($p_base, $p_filter="", $p_search="") { // for the sort - $url=HtmlInput::get_to_string(array("closed_action", "remind_date_end", "remind_date", "sag_ref", "only_internal", "state", "qcode", "ag_dest_query", "action_query", "tdoc", "date_start", "date_end", "hsstate", "searchtag")).'&'.$p_base; + $arg=HtmlInput::get_to_string(array("closed_action", "remind_date_end", "remind_date", "sag_ref", "only_internal", "state", "qcode", "ag_dest_query", "action_query", "tdoc", "date_start", "date_end", "hsstate", "searchtag"),""); + $url=$p_base.$arg; $table=new Sort_Table(); $table->add('Date Doc.', $url, 'order by ag_timestamp asc', 'order by ag_timestamp desc', 'da', 'dd'); @@ -689,7 +690,7 @@ class Follow_Up //show the sub_action foreach ($a_row as $row) { - $href=''; + $href=''; $i++; $tr=($i%2==0)?'even':'odd'; if ($row['ag_priority']<2) diff --git a/include/lib/html_input.class.php b/include/lib/html_input.class.php index 7ca7c5516..0cbbabbe4 100755 --- a/include/lib/html_input.class.php +++ b/include/lib/html_input.class.php @@ -680,7 +680,7 @@ class HtmlInput static function array_to_string($array, $global_array, $start="?") { - $r=$start; + $r=""; if (count($global_array)==0) return ''; @@ -704,7 +704,7 @@ class HtmlInput } $and="&"; } - + if (trim ($r) != "") $r=$start.$r; return $r; }