From 4800da16537ec97fdebb57c5e70e852516bb818e Mon Sep 17 00:00:00 2001 From: Romain Quetiez Date: Wed, 9 Apr 2014 14:00:09 +0000 Subject: [PATCH] #913 Error when searching for child requests and no organization is specified. Still, I could not figure out WHY IT WAS WORKING WHEN AN ORG IS SELECTED as a search filter! SVN:trunk[3123] --- application/ui.linksdirectwidget.class.inc.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/application/ui.linksdirectwidget.class.inc.php b/application/ui.linksdirectwidget.class.inc.php index e2d63b692..c3b1e8872 100644 --- a/application/ui.linksdirectwidget.class.inc.php +++ b/application/ui.linksdirectwidget.class.inc.php @@ -318,12 +318,11 @@ class UILinksWidgetDirect { $oFilter->AddCondition('id', $aAlreadyLinked, 'NOTIN'); } - $aArgs = array(); if ($oCurrentObj != null) { - $aArgs = $oCurrentObj->ToArgs('this'); + $aArgs = array_merge($oCurrentObj->ToArgs('this'), $oFilter->GetInternalParams()); + $oFilter->SetInternalParams($aArgs); } - $oFilter->SetInternalParams($aArgs); $oBlock = new DisplayBlock($oFilter, 'list', false); $oBlock->Display($oP, "ResultsToAdd_{$this->sInputid}", array('menu' => false, 'cssCount'=> '#count_'.$this->sInputid , 'selection_mode' => true, 'table_id' => 'add_'.$this->sInputid)); // Don't display the 'Actions' menu on the results }