From 74fdf7b79cf518be704ef0f78b594db6890545fe Mon Sep 17 00:00:00 2001
From: Franz Liedke <franz@develophp.org>
Date: Sat, 29 Aug 2015 23:07:21 +0200
Subject: [PATCH] Make sure query filter works with database prefix

Related to flarum/core#269.
---
 extensions/subscriptions/src/Gambits/SubscriptionGambit.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/extensions/subscriptions/src/Gambits/SubscriptionGambit.php b/extensions/subscriptions/src/Gambits/SubscriptionGambit.php
index 3714f58c9..878a5a6f5 100644
--- a/extensions/subscriptions/src/Gambits/SubscriptionGambit.php
+++ b/extensions/subscriptions/src/Gambits/SubscriptionGambit.php
@@ -2,6 +2,7 @@
 
 use Flarum\Core\Search\Search;
 use Flarum\Core\Search\RegexGambit;
+use Illuminate\Database\Query\Expression;
 
 class SubscriptionGambit extends RegexGambit
 {
@@ -16,7 +17,7 @@ class SubscriptionGambit extends RegexGambit
         $search->getQuery()->$method(function ($query) use ($actor, $matches) {
             $query->select(app('flarum.db')->raw(1))
                   ->from('users_discussions')
-                  ->whereRaw('discussion_id = discussions.id')
+                  ->where('discussions.id', new Expression('discussion_id'))
                   ->where('user_id', $actor->id)
                   ->where('subscription', $matches[1] === 'follow' ? 'follow' : 'ignore');
         });