Fixed SQL problems

diff --git a/include/threads.php b/include/threads.php
index 44a7e6538447fc55baa41cdd53f5b92f857b5c7c..dddcc4cdd311df4a328322fb72bbae6959d08eca 100644 (file)
--- a/include/threads.php
+++ b/include/threads.php
@@ -111,7 +111,7 @@ function update_thread_uri($itemuri, $uid) {
 }
 
 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`,
+       $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`  FROM `item` WHERE `id` = %d AND (`parent` = %d OR `parent` = 0) LIMIT 1", intval($itemid), intval($itemid));
 
        if (!$items)

diff --git a/mod/network.php b/mod/network.php
index 3317dc684b49fc7be310dd6c998632a77f33f8a5..a07c5868ec995d467bd3eaa9ea9da3762c2a7cac 100644 (file)
--- a/mod/network.php
+++ b/mod/network.php
@@ -670,7 +670,7 @@ function network_content(&$a, $update = 0) {
        }
 
        if($conv)
-               $sql_extra3 .= " AND `mention`";
+               $sql_extra3 .= " AND $sql_table.`mention`";
 
        if($update) {