Auto update of network page only at top of the page

[friendica.git] / include / ostatus_conversation.php

diff --git a/include/ostatus_conversation.php b/include/ostatus_conversation.php
index ad90e3d3118c664861a753abb95a79465138717e..2fa7d7a54451621b53973a3af59cffdbdaf9d9f2 100644 (file)
--- a/include/ostatus_conversation.php
+++ b/include/ostatus_conversation.php
@@ -28,7 +28,7 @@ function check_conversations() {
         logger('complete_conversation: cron_start');
 
         $start = date("Y-m-d H:i:s", time() - ($poll_timeframe * 60));
-        $conversations = q("SELECT * FROM `term` WHERE `type` = 7 AND `term` > '%s'", 
+        $conversations = q("SELECT * FROM `term` WHERE `type` = 7 AND `term` > '%s'",
                                 dbesc($start));
         foreach ($conversations AS $conversation) {
                 $id = $conversation['oid'];
@@ -44,6 +44,9 @@ function check_conversations() {
 function complete_conversation($itemid, $conversation_url, $only_add_conversation = false) {
        global $a;
 
+       if (intval(get_config('system','ostatus_poll_interval')) == -2)
+               return;
+
        if ($a->last_ostatus_conversation_url == $conversation_url)
                return;
 
@@ -141,7 +144,7 @@ function complete_conversation($itemid, $conversation_url, $only_add_conversatio
                if ($message_exists) {
                        if ($parent["id"] != 0) {
                                $existing_message = $message_exists[0];
-                               $r = q("UPDATE `item` SET `parent` = %d, `parent-uri` = '%s', `thr-parent` = '%s' WHERE `id` = %d LIMIT 1",
+                               $r = q("UPDATE `item` SET `parent` = %d, `parent-uri` = '%s', `thr-parent` = '%s' WHERE `id` = %d",
                                        intval($parent["id"]),
                                        dbesc($parent["uri"]),
                                        dbesc($parent_uri),