Merge remote-tracking branch 'upstream/develop' into 1601-dfrn-import

[friendica.git] / mod / network.php

diff --git a/mod/network.php b/mod/network.php
index a12fa4ec36b95f1b733d479e4b65f70dc8315925..a07c5868ec995d467bd3eaa9ea9da3762c2a7cac 100644 (file)
--- a/mod/network.php
+++ b/mod/network.php
@@ -588,10 +588,6 @@ function network_content(&$a, $update = 0) {
                        intval($cid)
                );
                if(count($r)) {
-                       //$sql_post_table = " INNER JOIN (SELECT DISTINCT(`parent`) FROM `item`
-                       //                  WHERE 1 $sql_options AND `contact-id` = ".intval($cid)." AND `deleted` = 0
-                       //                  ORDER BY `item`.`received` DESC) AS `temp1`
-                       //                  ON $sql_table.$sql_parent = `temp1`.`parent` ";
                        $sql_extra = " AND ".$sql_table.".`contact-id` = ".intval($cid);
 
                        $entries[0] = array(
@@ -674,7 +670,7 @@ function network_content(&$a, $update = 0) {
        }
 
        if($conv)
-               $sql_extra3 .= " AND `mention`";
+               $sql_extra3 .= " AND $sql_table.`mention`";
 
        if($update) {