Merge remote-tracking branch 'origin/1.2' into 2.0

# Conflicts:
#	code/PostgreSQLDatabase.php
This commit is contained in:
Damian Mooyman 2017-12-07 16:30:22 +13:00
commit 1f6d892609
No known key found for this signature in database
GPG Key ID: 78B823A10DE27D1A

View File

@ -362,6 +362,9 @@ class PostgreSQLDatabase extends Database
*/
public function searchEngine($classesToSearch, $keywords, $start, $pageLength, $sortBy = "ts_rank DESC", $extraFilter = "", $booleanSearch = false, $alternativeFileFilter = "", $invertedMatch = false)
{
$start = (int)$start;
$pageLength = (int)$pageLength;
//Fix the keywords to be ts_query compatitble:
//Spaces must have pipes
//@TODO: properly handle boolean operators here.