Merge remote-tracking branch 'upstream/develop' into rewrites/coding-convention-split...

[friendica.git] / include / threads.php

diff --git a/include/threads.php b/include/threads.php
index 7a6305f85b02f2ffc14ab40e4edeb81e846092a9..bb978bc77428f05a962e9d3c355daa149043b20d 100644 (file)
--- a/include/threads.php
+++ b/include/threads.php
@@ -177,29 +177,34 @@ function add_shadow_entry($itemid) {
 function update_thread_uri($itemuri, $uid) {
        $messages = q("SELECT `id` FROM `item` WHERE uri ='%s' AND uid=%d", dbesc($itemuri), intval($uid));
 
-       if (dbm::is_result($messages))
-               foreach ($messages as $message)
+       if (dbm::is_result($messages)) {
+               foreach ($messages as $message) {
                        update_thread($message["id"]);
+               }
+       }
 }
 
 function update_thread($itemid, $setmention = false) {
        $items = q("SELECT `uid`, `guid`, `title`, `body`, `created`, `edited`, `commented`, `received`, `changed`, `wall`, `private`, `pubmail`, `moderated`, `visible`, `spam`, `starred`, `bookmark`, `contact-id`, `gcontact-id`,
                        `deleted`, `origin`, `forum_mode`, `network`, `rendered-html`, `rendered-hash` FROM `item` WHERE `id` = %d AND (`parent` = %d OR `parent` = 0) LIMIT 1", intval($itemid), intval($itemid));
 
-       if (!dbm::is_result($items))
+       if (!dbm::is_result($items)) {
                return;
+       }
 
        $item = $items[0];
 
-       if ($setmention)
+       if ($setmention) {
                $item["mention"] = 1;
+       }
 
        $sql = "";
 
        foreach ($item AS $field => $data)
                if (!in_array($field, array("guid", "title", "body", "rendered-html", "rendered-hash"))) {
-                       if ($sql != "")
+                       if ($sql != "") {
                                $sql .= ", ";
+                       }
 
                        $sql .= "`".$field."` = '".dbesc($data)."'";
                }
@@ -211,8 +216,9 @@ function update_thread($itemid, $setmention = false) {
        // Updating a shadow item entry
        $items = q("SELECT `id` FROM `item` WHERE `guid` = '%s' AND `uid` = 0 LIMIT 1", dbesc($item["guid"]));
 
-       if (!$items)
+       if (!dbm::is_result($items)) {
                return;
+       }
 
        $result = q("UPDATE `item` SET `title` = '%s', `body` = '%s', `rendered-html` = '%s', `rendered-hash` = '%s' WHERE `id` = %d",
                        dbesc($item["title"]),
@@ -227,9 +233,11 @@ function update_thread($itemid, $setmention = false) {
 function delete_thread_uri($itemuri, $uid) {
        $messages = q("SELECT `id` FROM `item` WHERE uri ='%s' AND uid=%d", dbesc($itemuri), intval($uid));
 
-       if(count($messages))
-               foreach ($messages as $message)
+       if (dbm::is_result($messages)) {
+               foreach ($messages as $message) {
                        delete_thread($message["id"], $itemuri);
+               }
+       }
 }
 
 function delete_thread($itemid, $itemuri = "") {