From 2dd28472308d9546f89198353f6153679b53556c Mon Sep 17 00:00:00 2001 From: Franz Liedke Date: Mon, 23 Jul 2018 16:33:30 +0200 Subject: [PATCH] Ensure compatibility with DB table prefix --- extensions/subscriptions/src/Gambit/SubscriptionGambit.php | 2 +- .../src/Listener/FilterDiscussionListBySubscription.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/extensions/subscriptions/src/Gambit/SubscriptionGambit.php b/extensions/subscriptions/src/Gambit/SubscriptionGambit.php index b906945f5..e3f0588c2 100644 --- a/extensions/subscriptions/src/Gambit/SubscriptionGambit.php +++ b/extensions/subscriptions/src/Gambit/SubscriptionGambit.php @@ -33,7 +33,7 @@ class SubscriptionGambit extends AbstractRegexGambit $search->getQuery()->$method(function ($query) use ($actor, $matches) { $query->selectRaw('1') ->from('users_discussions') - ->whereRaw('discussions.id = discussion_id') + ->whereColumn('discussions.id', 'discussion_id') ->where('user_id', $actor->id) ->where('subscription', $matches[1] === 'follow' ? 'follow' : 'ignore'); }); diff --git a/extensions/subscriptions/src/Listener/FilterDiscussionListBySubscription.php b/extensions/subscriptions/src/Listener/FilterDiscussionListBySubscription.php index 60dc30dfd..e8b4ac1f0 100755 --- a/extensions/subscriptions/src/Listener/FilterDiscussionListBySubscription.php +++ b/extensions/subscriptions/src/Listener/FilterDiscussionListBySubscription.php @@ -46,7 +46,7 @@ class FilterDiscussionListBySubscription $event->search->getQuery()->whereNotExists(function ($query) use ($actor) { $query->selectRaw(1) ->from('users_discussions') - ->whereRaw('discussions.id = discussion_id') + ->whereColumn('discussions.id', 'discussion_id') ->where('user_id', $actor->id) ->where('subscription', 'ignore'); });