Unused variables removed

[friendica.git] / mod / network.php

diff --git a/mod/network.php b/mod/network.php
index 0c2cbccf55bc9d21ea3c4d53c535dff33ae22b08..b6afda608b0aa1873d331bac6e370744db9c1a36 100644 (file)
--- a/mod/network.php
+++ b/mod/network.php
@@ -37,9 +37,8 @@ use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Model\Group;
 use Friendica\Model\Item;
+use Friendica\Model\Post\Category;
 use Friendica\Model\Profile;
-use Friendica\Model\Tag;
-use Friendica\Model\Term;
 use Friendica\Module\Security\Login;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Proxy as ProxyUtils;
@@ -380,25 +379,25 @@ function networkFlatView(App $a, $update = 0)
 
        networkPager($a, $pager, $update);
 
-       $item_params = ['order' => ['id' => true]];
 
        if (strlen($file)) {
-               $term_condition = ["`term` = ? AND `otype` = ? AND `type` = ? AND `uid` = ?",
-                       $file, Term::OBJECT_TYPE_POST, Term::FILE, local_user()];
+               $item_params = ['order' => ['uri-id' => true]];
+               $term_condition = ['name' => $file, 'type' => Category::FILE, 'uid' => local_user()];
                $term_params = ['order' => ['tid' => true], 'limit' => [$pager->getStart(), $pager->getItemsPerPage()]];
-               $result = DBA::select('term', ['oid'], $term_condition, $term_params);
+               $result = DBA::select('category-view', ['uri-id'], $term_condition, $term_params);
 
                $posts = [];
                while ($term = DBA::fetch($result)) {
-                       $posts[] = $term['oid'];
+                       $posts[] = $term['uri-id'];
                }
                DBA::close($result);
 
                if (count($posts) == 0) {
                        return '';
                }
-               $item_condition = ['uid' => local_user(), 'id' => $posts];
+               $item_condition = ['uid' => local_user(), 'uri-id' => $posts];
        } else {
+               $item_params = ['order' => ['id' => true]];
                $item_condition = ['uid' => local_user()];
                $item_params['limit'] = [$pager->getStart(), $pager->getItemsPerPage()];
 
@@ -788,14 +787,13 @@ function networkThreadedView(App $a, $update, $parent)
                }
 
                $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`
+                       STRAIGHT_JOIN (SELECT `uri-id` FROM `tag-search-view` WHERE `name` IN
+                               (SELECT SUBSTR(`term`, 2) FROM `search` WHERE `uid` = ? AND `term` LIKE '#%') AND `uid` = 0) AS `tag-search`
+                       ON `item`.`uri-id` = `tag-search`.`uri-id`
                        STRAIGHT_JOIN `contact` AS `author` ON `author`.`id` = `item`.`author-id`
                        WHERE `item`.`uid` = 0 AND `item`.$ordering < ? AND `item`.$ordering > ? AND `item`.`gravity` = ?
                                AND NOT `author`.`hidden` AND NOT `author`.`blocked`" . $sql_tag_nets,
-                       local_user(), Term::OBJECT_TYPE_POST, Tag::HASHTAG,
-                       $top_limit, $bottom_limit, GRAVITY_PARENT);
+                       local_user(), $top_limit, $bottom_limit, GRAVITY_PARENT);
 
                $data = DBA::toArray($items);