From 440e2d82b16abde01ff931753ba3c27a09ac8ae6 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Mon, 23 Feb 2015 12:44:50 +0100 Subject: [PATCH] Global setting for the behaviour of likes. --- include/items.php | 2 +- mod/network.php | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/include/items.php b/include/items.php index 53bacbcd0..dd4021775 100644 --- a/include/items.php +++ b/include/items.php @@ -1435,7 +1435,7 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa // update the commented timestamp on the parent // Only update "commented" if it is really a comment - if ($arr['verb'] == ACTIVITY_POST) + if (($arr['verb'] == ACTIVITY_POST) OR !get_config("system", "like_no_comment")) q("UPDATE `item` SET `commented` = '%s', `changed` = '%s' WHERE `id` = %d", dbesc(datetime_convert()), dbesc(datetime_convert()), diff --git a/mod/network.php b/mod/network.php index fb980f31b..c180252f4 100644 --- a/mod/network.php +++ b/mod/network.php @@ -705,15 +705,19 @@ die("ss"); // Fetch a page full of parent items for this page if($update) { + if (!get_config("system", "like_no_comment")) + $sql_extra4 = "(`item`.`deleted` = 0 OR `item`.`verb` = '".ACTIVITY_LIKE."' OR `item`.`verb` = '".ACTIVITY_DISLIKE."')"; + else + $sql_extra4 = "`item`.`deleted` = 0"; + $r = q("SELECT `item`.`parent` AS `item_id`, `item`.`network` AS `item_network`, `contact`.`uid` AS `contact_uid` FROM $sql_table $sql_post_table INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id` AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 - WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0 - and `item`.`moderated` = 0 and `item`.`unseen` = 1 + WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND $sql_extra4 + AND `item`.`moderated` = 0 AND `item`.`unseen` = 1 $sql_extra3 $sql_extra $sql_nets ORDER BY `item_id` DESC LIMIT 100", intval(local_user()) ); - // (`item`.`deleted` = 0 OR `item`.`verb` = '" . ACTIVITY_LIKE ."' OR `item`.`verb` = '" . ACTIVITY_DISLIKE . "') } else { $r = q("SELECT `thread`.`iid` AS `item_id`, `thread`.`network` AS `item_network`, `contact`.`uid` AS `contact_uid` FROM $sql_table $sql_post_table STRAIGHT_JOIN `contact` ON `contact`.`id` = `thread`.`contact-id`