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

# Conflicts: # code/SQLite3Database.php # code/SQLiteDatabaseConfigurationHelper.php
silverstripe · Dec 7, 2017 · 9b00630 · 9b00630
2 parents dbf1048 + e8f4e55
commit 9b00630
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/code/SQLite3Database.php b/code/SQLite3Database.php
@@ -300,6 +300,8 @@ public function searchEngine(
         $alternativeFileFilter = "",
         $invertedMatch = false
     ) {
+        $start = (int)$start;
+        $pageLength = (int)$pageLength;
         $keywords = $this->escapeString(str_replace(array('*', '+', '-', '"', '\''), '', $keywords));
         $htmlEntityKeywords = htmlentities(utf8_decode($keywords));
 
@@ -326,7 +328,7 @@ public function searchEngine(
             $extraFilters[$fileClass] .= " AND ShowInSearch <> 0";
         }
 
-        $limit = $start . ", " . (int) $pageLength;
+        $limit = $start . ", " . $pageLength;
 
         $notMatch = $invertedMatch ? "NOT " : "";
         if ($keywords) {