From bb8232297f9b8821b99837a3dfb4792c7f785084 Mon Sep 17 00:00:00 2001
From: Toby Zerner <toby.zerner@gmail.com>
Date: Mon, 27 Jul 2015 12:44:45 +0930
Subject: [PATCH] Fix following discussion list filter

---
 .../subscriptions/js/forum/src/addSubscriptionFilter.js       | 4 ++--
 extensions/subscriptions/src/Gambits/SubscriptionGambit.php   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/subscriptions/js/forum/src/addSubscriptionFilter.js b/extensions/subscriptions/js/forum/src/addSubscriptionFilter.js
index 36a37a902..50b74e7d7 100644
--- a/extensions/subscriptions/js/forum/src/addSubscriptionFilter.js
+++ b/extensions/subscriptions/js/forum/src/addSubscriptionFilter.js
@@ -19,8 +19,8 @@ export default function addSubscriptionControls() {
   });
 
   extend(DiscussionList.prototype, 'requestParams', function(params) {
-    if (params.filter === 'following') {
-      params.q = (params.q || '') + ' is:following';
+    if (this.props.params.filter === 'following') {
+      params.filter.q = (params.filter.q || '') + ' is:following';
     }
   });
 }
diff --git a/extensions/subscriptions/src/Gambits/SubscriptionGambit.php b/extensions/subscriptions/src/Gambits/SubscriptionGambit.php
index 15198cccd..3714f58c9 100644
--- a/extensions/subscriptions/src/Gambits/SubscriptionGambit.php
+++ b/extensions/subscriptions/src/Gambits/SubscriptionGambit.php
@@ -14,7 +14,7 @@ class SubscriptionGambit extends RegexGambit
         // might be better as `id IN (subquery)`?
         $method = $negate ? 'whereNotExists' : 'whereExists';
         $search->getQuery()->$method(function ($query) use ($actor, $matches) {
-            $query->select(app('db')->raw(1))
+            $query->select(app('flarum.db')->raw(1))
                   ->from('users_discussions')
                   ->whereRaw('discussion_id = discussions.id')
                   ->where('user_id', $actor->id)