Commit 4bf6f23b62eb458ed8e78947548b09bf4fea512c
1 parent
4cad0a63
KTS-673
"The search algorithm needs some work" Updated. KTS-2358 "php5 migration" Updated. Removed & from &new. Committed By: Conrad Vermeulen Reviewed By: Kevin Fourie git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@7172 c91229c3-7414-0410-bfa2-8a42b809f60b
Showing
1 changed file
with
6 additions
and
2 deletions
lib/actions/bulkaction.php
| ... | ... | @@ -325,14 +325,18 @@ class KTBulkAction extends KTStandardDispatcher { |
| 325 | 325 | $sReturnData = KTUtil::arrayGet($_REQUEST, 'fFolderId'); |
| 326 | 326 | } |
| 327 | 327 | $sTargetUrl = KTBrowseUtil::getUrlForFolder(Folder::get($sReturnData)); |
| 328 | - } else if($sReturnAction == 'simpleSearch') { | |
| 328 | + } elseif($sReturnAction == 'simpleSearch') { | |
| 329 | 329 | $sTargetUrl = KTBrowseUtil::getSimpleSearchBaseUrl(); |
| 330 | 330 | $extraargs = array('fSearchableText'=>$sReturnData); |
| 331 | - } else if($sReturnAction == 'booleanSearch') { | |
| 331 | + } elseif($sReturnAction == 'booleanSearch') { | |
| 332 | 332 | $sTargetUrl = KTBrowseUtil::getBooleanSearchBaseUrl(); |
| 333 | 333 | $sAction = 'performSearch'; |
| 334 | 334 | $extraargs = array('boolean_search_id'=>$sReturnData); |
| 335 | 335 | } |
| 336 | + elseif($sReturnAction == 'search2') { | |
| 337 | + $sTargetUrl = KTBrowseUtil::getSearchResultURL(); | |
| 338 | + $sAction = 'searchResults'; | |
| 339 | + } | |
| 336 | 340 | |
| 337 | 341 | $oForm = new KTForm; |
| 338 | 342 | $oForm->setOptions(array( | ... | ... |