Merge pull request #1415 from annando/1502-like-no-update-commented

New Global setting: like shouldn't set "commented"

diff --git a/include/items.php b/include/items.php
index 3a9d850d48df56344adba579a8ae9dd8e6cb5217..dd4021775380dd2121ceec673dbf97b202e09b81 100644 (file)
--- a/include/items.php
+++ b/include/items.php
@@ -1434,12 +1434,18 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa
        $arr['deleted'] = $parent_deleted;
 
        // update the commented timestamp on the parent
-
-       q("UPDATE `item` set `commented` = '%s', `changed` = '%s' WHERE `id` = %d",
-               dbesc(datetime_convert()),
-               dbesc(datetime_convert()),
-               intval($parent_id)
-       );
+       // Only update "commented" if it is really a comment
+       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()),
+                       intval($parent_id)
+               );
+       else
+               q("UPDATE `item` SET `changed` = '%s' WHERE `id` = %d",
+                       dbesc(datetime_convert()),
+                       intval($parent_id)
+               );
 
        if($dsprsig) {
                q("insert into sign (`iid`,`signed_text`,`signature`,`signer`) values (%d,'%s','%s','%s') ",

diff --git a/mod/network.php b/mod/network.php
index a28840dae2e247bab9c6cdaeb7384f98026e9521..c180252f4440bedf17743efd7b07a350d4135c5e 100644 (file)
--- a/mod/network.php
+++ b/mod/network.php
@@ -22,7 +22,7 @@ function network_init(&$a) {
        parse_str($query_string, $query_array);
        array_shift($query_array);
 
-       
+
        // fetch last used network view and redirect if needed
        if(! $is_a_date_query) {
                $sel_tabs = network_query_get_sel_tab($a);
@@ -705,12 +705,16 @@ 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 OR `item`.`verb` = '" . ACTIVITY_LIKE ."' OR `item`.`verb` = '" . ACTIVITY_DISLIKE . "')
-                               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())
                        );