Just some more fixed notice

[friendica.git] / mod / network.php

diff --git a/mod/network.php b/mod/network.php
index 98ffd741f91eda204f60f81da82e4f39d24c1b26..af9e111c9fd89de98f11d3cc278323ca98d48eee 100644 (file)
--- a/mod/network.php
+++ b/mod/network.php
@@ -15,6 +15,7 @@ use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
 use Friendica\Core\System;
+use Friendica\Database\dba;
 use Friendica\Database\DBM;
 use Friendica\Model\Contact;
 use Friendica\Model\Group;
@@ -589,13 +590,14 @@ function networkThreadedView(App $a, $update, $parent)
        // desired.
 
        $sql_post_table = '';
-       $sql_options = (($star) ? " AND `thread`.`starred` " : '');
-       $sql_options .= (($bmark) ? " AND `thread`.`bookmark` " : '');
+       $sql_options = ($star ? " AND `thread`.`starred` " : '');
+       $sql_options .= ($bmark ? sprintf(" AND `thread`.`post-type` = %d ", Item::PT_PAGE) : '');
        $sql_extra = $sql_options;
        $sql_extra2 = '';
        $sql_extra3 = '';
        $sql_table = '`thread`';
        $sql_parent = '`iid`';
+       $sql_order = '';
 
        if ($update) {
                $sql_table = '`item`';
@@ -833,7 +835,7 @@ function networkThreadedView(App $a, $update, $parent)
                        $top_limit = DateTimeFormat::utcNow();
                }
 
-               $items = dba::p("SELECT `item`.`parent-uri` AS `uri`, 0 AS `item_id`, `item`.$ordering AS `order_date` FROM `item`
+               $items = dba::p("SELECT `item`.`parent-uri` AS `uri`, 0 AS `item_id`, `item`.$ordering AS `order_date`, `author`.`url` AS `author-link` FROM `item`
                        STRAIGHT_JOIN (SELECT `oid` FROM `term` WHERE `term` IN
                                (SELECT SUBSTR(`term`, 2) FROM `search` WHERE `uid` = ? AND `term` LIKE '#%') AND `otype` = ? AND `type` = ? AND `uid` = 0) AS `term`
                        ON `item`.`id` = `term`.`oid`