From c7d7b2d36003b3c694806af67f9a8bf84e6b2ced Mon Sep 17 00:00:00 2001
From: Toby Zerner <toby.zerner@gmail.com>
Date: Mon, 13 Nov 2017 09:17:55 +1030
Subject: [PATCH] Fix subsequent pages of results not working properly

---
 .../sticky/src/Listener/PinStickiedDiscussionsToTop.php      | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/extensions/sticky/src/Listener/PinStickiedDiscussionsToTop.php b/extensions/sticky/src/Listener/PinStickiedDiscussionsToTop.php
index 1f0f54e8d..78fc69610 100755
--- a/extensions/sticky/src/Listener/PinStickiedDiscussionsToTop.php
+++ b/extensions/sticky/src/Listener/PinStickiedDiscussionsToTop.php
@@ -69,7 +69,7 @@ class PinStickiedDiscussionsToTop
             if (empty($gambits)) {
                 $sticky = clone $query;
                 $sticky->where('is_sticky', true);
-                $sticky->limit = $sticky->offset = $sticky->orders = null;
+                $sticky->orders = null;
 
                 $query->union($sticky);
 
@@ -89,6 +89,9 @@ class PinStickiedDiscussionsToTop
                 $query->unionOrders = array_merge($query->unionOrders, $query->orders);
                 $query->unionLimit = $query->limit;
                 $query->unionOffset = $query->offset;
+
+                $query->limit = $sticky->limit = $query->offset + $query->limit;
+                $query->offset = $sticky->offset = null;
             }
         }
     }