From f299391aa1592590e63d493540f50ba0d7891fb0 Mon Sep 17 00:00:00 2001 From: Mario Date: Fri, 6 May 2022 08:24:17 +0000 Subject: fix core issue #1676 and a liked/disliked/commented confusion --- Zotlabs/Module/Sse_bs.php | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) (limited to 'Zotlabs/Module') diff --git a/Zotlabs/Module/Sse_bs.php b/Zotlabs/Module/Sse_bs.php index 3a13b0a6f..ad9be0938 100644 --- a/Zotlabs/Module/Sse_bs.php +++ b/Zotlabs/Module/Sse_bs.php @@ -160,8 +160,12 @@ class Sse_bs extends Controller { $offset = self::$offset; $sql_extra = ''; - if(! (self::$vnotify & VNOTIFY_LIKE)) + if (!(self::$vnotify & VNOTIFY_LIKE)) { $sql_extra = " AND verb NOT IN ('" . dbesc(ACTIVITY_LIKE) . "', '" . dbesc(ACTIVITY_DISLIKE) . "') "; + } + elseif (!feature_enabled(self::$uid, 'dislike')) { + $sql_extra = " AND verb NOT IN ('" . dbesc(ACTIVITY_DISLIKE) . "') "; + } $sql_extra2 = ''; if(self::$xchans) @@ -236,8 +240,12 @@ class Sse_bs extends Controller { $offset = self::$offset; $sql_extra = ''; - if(! (self::$vnotify & VNOTIFY_LIKE)) + if (!(self::$vnotify & VNOTIFY_LIKE)) { $sql_extra = " AND verb NOT IN ('" . dbesc(ACTIVITY_LIKE) . "', '" . dbesc(ACTIVITY_DISLIKE) . "') "; + } + elseif (!feature_enabled(self::$uid, 'dislike')) { + $sql_extra = " AND verb NOT IN ('" . dbesc(ACTIVITY_DISLIKE) . "') "; + } $sql_extra2 = ''; if(self::$xchans) @@ -311,8 +319,12 @@ class Sse_bs extends Controller { $offset = self::$offset; $sql_extra = ''; - if(! (self::$vnotify & VNOTIFY_LIKE)) + if (!(self::$vnotify & VNOTIFY_LIKE)) { $sql_extra = " AND verb NOT IN ('" . dbesc(ACTIVITY_LIKE) . "', '" . dbesc(ACTIVITY_DISLIKE) . "') "; + } + elseif (!feature_enabled(self::$uid, 'dislike')) { + $sql_extra = " AND verb NOT IN ('" . dbesc(ACTIVITY_DISLIKE) . "') "; + } $sql_extra2 = ''; if(self::$xchans) @@ -398,8 +410,12 @@ class Sse_bs extends Controller { $sys = get_sys_channel(); $sql_extra = ''; - if(! (self::$vnotify & VNOTIFY_LIKE)) + if (!(self::$vnotify & VNOTIFY_LIKE)) { $sql_extra = " AND verb NOT IN ('" . dbesc(ACTIVITY_LIKE) . "', '" . dbesc(ACTIVITY_DISLIKE) . "') "; + } + elseif (!feature_enabled(self::$uid, 'dislike')) { + $sql_extra = " AND verb NOT IN ('" . dbesc(ACTIVITY_DISLIKE) . "') "; + } $sql_extra2 = ''; if(self::$xchans) -- cgit v1.2.3