Fix for error in delete function, improved query for community.

diff --git a/include/threads.php b/include/threads.php
index 2645098f572ec75b3679e8bfb0a2688dae731d00..0ad1d396dffa94b46eab7700cc7d0044d496eb71 100644 (file)
--- a/include/threads.php
+++ b/include/threads.php
@@ -17,7 +17,11 @@ function add_thread($itemid) {
 
        logger("add_thread: Add thread for item ".$itemid." - ".print_r($result, true), LOGGER_DEBUG);
 
-       // Adding a shadow item entry
+       // Store a shadow copy of public items for displaying a global community page?
+       if (!get_config('system', 'global_community'))
+               return;
+
+       // is it already a copy?
        if (($itemid == 0) OR ($item['uid'] == 0))
                return;
 
@@ -139,7 +143,7 @@ function delete_thread($itemid) {
 
        logger("delete_thread: Deleted thread for item ".$itemid." - ".print_r($result, true), LOGGER_DEBUG);
 
-       if ($count($item)) {
+       if (count($item)) {
                $r = q("SELECT `id` FROM `item` WHERE `uri` = '%s' AND NOT (`uid` IN (%d, 0))",
                                dbesc($item["uri"]),
                                intval($item["uid"])

diff --git a/mod/community.php b/mod/community.php
index 5b3f40a798f47892c407ff3716c330879499569e..30eb6ebb036e2a6f585399aeaa3012f7778382a0 100644 (file)
--- a/mod/community.php
+++ b/mod/community.php
@@ -114,7 +114,9 @@ function community_content(&$a, $update = 0) {
 }
 
 function community_getitems($start, $itemspage) {
-// Work in progress    return(community_getpublicitems($start, $itemspage));
+       // Work in progress
+       if (get_config('system', 'global_community'))
+               return(community_getpublicitems($start, $itemspage));
 
        $r = q("SELECT `item`.`uri`, `item`.*, `item`.`id` AS `item_id`,
                `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`alias`, `contact`.`rel`,
@@ -143,12 +145,13 @@ function community_getpublicitems($start, $itemspage) {
        $r = q("SELECT `item`.`uri`, `item`.*, `item`.`id` AS `item_id`,
                        `author-name` AS `name`, `owner-avatar` AS `photo`,
                        `owner-link` AS `url`, `owner-avatar` AS `thumb`
-               FROM `item` WHERE `item`.`uid` = 0 AND `network` IN ('%s', '%s')
+               FROM `item` WHERE `item`.`uid` = 0 AND `network` IN ('%s', '%s', '%s')
                AND `item`.`allow_cid` = '' AND `item`.`allow_gid` = ''
                AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = ''
                ORDER BY `item`.`received` DESC LIMIT %d, %d",
                dbesc(NETWORK_DFRN),
                dbesc(NETWORK_DIASPORA),
+               dbesc(NETWORK_OSTATUS),
                intval($start),
                intval($itemspage)
        );