aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2022-05-06 08:24:17 +0000
committerMario <mario@mariovavti.com>2022-05-06 08:24:17 +0000
commitf299391aa1592590e63d493540f50ba0d7891fb0 (patch)
treeb464d9e6684a3b286d3fa6ba872ef5b23260da72 /Zotlabs/Module
parentc334fc9d22c7f2633d9b7e8d9e0fae1f2bb40547 (diff)
downloadvolse-hubzilla-f299391aa1592590e63d493540f50ba0d7891fb0.tar.gz
volse-hubzilla-f299391aa1592590e63d493540f50ba0d7891fb0.tar.bz2
volse-hubzilla-f299391aa1592590e63d493540f50ba0d7891fb0.zip
fix core issue #1676 and a liked/disliked/commented confusion
Diffstat (limited to 'Zotlabs/Module')
-rw-r--r--Zotlabs/Module/Sse_bs.php24
1 files changed, 20 insertions, 4 deletions
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)