More usage of dbm::is_result($r) instead of count($r):

[friendica.git] / include / threads.php

diff --git a/include/threads.php b/include/threads.php
index 8dfb41252573c47f6c45f6a6805a2de722580876..97904cadd85fce9c927d830d60d9191956ba45c8 100644 (file)
--- a/include/threads.php
+++ b/include/threads.php
@@ -23,7 +23,7 @@ function add_thread($itemid, $onlyshadow = false) {
 }
 
 /**
- * @brief Add a shadow entry for a given item id
+ * @brief Add a shadow entry for a given item id that is a thread starter
  *
  * We store every public item entry additionally with the user id "0".
  * This is used for the community page and for the search.
@@ -113,23 +113,41 @@ function add_shadow_thread($itemid) {
        }
 }
 
+/**
+ * @brief Add a shadow entry for a given item id that is a comment
+ *
+ * This function does the same like the function above - but for comments
+ *
+ * @param integer $itemid Item ID that should be added
+ */
 function add_shadow_entry($itemid) {
 
        $items = q("SELECT * FROM `item` WHERE `id` = %d", intval($itemid));
+
+       if (!dbm::is_result($items)) {
+               return;
+       }
+
        $item = $items[0];
 
+       // Is it a toplevel post?
+       if ($item['id'] == $item['parent']) {
+               add_shadow_thread($itemid);
+               return;
+       }
+
        // Is this a shadow entry?
        if ($item['uid'] == 0)
                return;
 
        // Is there a shadow parent?
        $r = q("SELECT `id` FROM `item` WHERE `uri` = '%s' AND `uid` = 0 LIMIT 1", dbesc($item['parent-uri']));
-       if (!count($r))
+       if (!dbm::is_result($r))
                return;
 
        // Is there already a shadow entry?
        $r = q("SELECT `id` FROM `item` WHERE `uri` = '%s' AND `uid` = 0 LIMIT 1", dbesc($item['uri']));
-       if (count($r))
+       if (dbm::is_result($r))
                return;
 
        // Preparing public shadow (removing user specific data)
@@ -223,7 +241,7 @@ function delete_thread($itemid, $itemuri = "") {
                                dbesc($itemuri),
                                intval($item["uid"])
                        );
-               if (!count($r)) {
+               if (!dbm::is_result($r)) {
                        $r = q("DELETE FROM `item` WHERE `uri` = '%s' AND `uid` = 0",
                                dbesc($itemuri)
                        );