From ff2c3b916a4e484130cfb12ae472eecc4450b2dd Mon Sep 17 00:00:00 2001
From: Ian <aristophian@googlemail.com>
Date: Sun, 1 Sep 2013 13:53:17 +0200
Subject: [PATCH] Fixed pagination when searching terms with fetchlimit < 4

---
 docs/NEWS                         |  2 ++
 include/functions_entries.inc.php | 11 +++++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/docs/NEWS b/docs/NEWS
index 976e4623..b58e7ec8 100644
--- a/docs/NEWS
+++ b/docs/NEWS
@@ -3,6 +3,8 @@
 Version trunk master ()
 ------------------------------------------------------------------------
 
+    * Fixed pagination when searching terms with fetchlimit < 4
+
     * Fixed deprecated /e modifier with PHP >= 5.5 in nl2br plugin restore method
 
 
diff --git a/include/functions_entries.inc.php b/include/functions_entries.inc.php
index b79faddf..1b9275ee 100644
--- a/include/functions_entries.inc.php
+++ b/include/functions_entries.inc.php
@@ -887,8 +887,15 @@ function &serendipity_searchEntries($term, $limit = '', $searchresults = '') {
     if ($p == 1 && strpos($term, '*') === false && $serendipity['dbType'] != 'sqlite' && $serendipity['dbType'] != 'sqlite3' && $serendipity['dbType'] != 'pdo-sqlite') {
         if (! is_array($search)) {
             return serendipity_searchEntries($term.'*', $orig_limit);
-        }else if (count($search) < 4){
-            return serendipity_searchEntries($term.'*', $orig_limit, $search);
+        } else {
+            $ec = count($search);
+            $checkcount = 4;
+            if ($serendipity['fetchLimit'] < $checkcount) {
+                $checkcount = $serendipity['fetchLimit'];
+            }
+            if ($ec < $checkcount) {
+                return serendipity_searchEntries($term.'*', $orig_limit, $search);
+            }
         }
     }