Merge remote-tracking branch 'upstream/develop' into 1607-performance

[friendica.git] / mod / network.php

diff --git a/mod/network.php b/mod/network.php
index d522598f5af80bfc354c2b6ffec0581d136c3448..6a074d08325d1c14dc554719cd6a01fa84ff2aa9 100644 (file)
--- a/mod/network.php
+++ b/mod/network.php
@@ -504,7 +504,7 @@ function network_content(&$a, $update = 0) {
        elseif($cid) {
 
                $r = qu("SELECT `id`,`name`,`network`,`writable`,`nurl`, `forum`, `prv`, `contact-type`, `addr`, `thumb`, `location` FROM `contact` WHERE `id` = %d
-                               AND NOT `blocked` LIMIT 1",
+                               AND (NOT `blocked` OR `pending`) LIMIT 1",
                        intval($cid)
                );
                if(count($r)) {
@@ -579,8 +579,8 @@ function network_content(&$a, $update = 0) {
                                $sql_extra = sprintf(" AND MATCH (`item`.`body`, `item`.`title`) AGAINST ('%s' in boolean mode) ", dbesc(protect_sprintf($search)));
                        else
                                $sql_extra = sprintf(" AND `item`.`body` REGEXP '%s' ", dbesc(protect_sprintf(preg_quote($search))));
-                       $sql_order = "`item`.`received`";
-                       $order_mode = "received";
+                       $sql_order = "`item`.`id`";
+                       $order_mode = "id";
                }
        }
        if(strlen($file)) {
@@ -598,12 +598,11 @@ function network_content(&$a, $update = 0) {
                // only setup pagination on initial page view
                $pager_sql = '';
 
-       }
-       else {
+       } else {
                if(get_config('system', 'old_pager')) {
                        $r = qu("SELECT COUNT(*) AS `total`
                                FROM $sql_table $sql_post_table INNER JOIN `contact` ON `contact`.`id` = $sql_table.`contact-id`
-                               AND NOT `contact`.`blocked`
+                               AND (NOT `contact`.`blocked` OR `contact`.`pending`)
                                WHERE $sql_table.`uid` = %d AND $sql_table.`visible` AND NOT $sql_table.`deleted`
                                $sql_extra2 $sql_extra3
                                $sql_extra $sql_nets ",
@@ -638,7 +637,7 @@ function network_content(&$a, $update = 0) {
                $simple_update = (($update) ? " AND `item`.`unseen` " : '');
 
                if ($sql_order == "")
-                       $sql_order = "`item`.`received`";
+                       $sql_order = "`item`.`id`";
 
                // "New Item View" - show all items unthreaded in reverse created date order
                $items = qu("SELECT %s FROM $sql_table $sql_post_table %s
@@ -681,7 +680,7 @@ function network_content(&$a, $update = 0) {
 
                        $r = qu("SELECT `item`.`parent` AS `item_id`, `item`.`network` AS `item_network`, `contact`.`uid` AS `contact_uid`
                                FROM $sql_table $sql_post_table INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
-                               AND NOT `contact`.`blocked`
+                               AND (NOT `contact`.`blocked` OR `contact`.`pending`)
                                WHERE `item`.`uid` = %d AND `item`.`visible` AND NOT `item`.`deleted` $sql_extra4
                                AND NOT `item`.`moderated` AND `item`.`unseen`
                                $sql_extra3 $sql_extra $sql_nets
@@ -691,7 +690,7 @@ function network_content(&$a, $update = 0) {
                } else {
                        $r = qu("SELECT `thread`.`iid` AS `item_id`, `thread`.`network` AS `item_network`, `contact`.`uid` AS `contact_uid`
                                FROM $sql_table $sql_post_table STRAIGHT_JOIN `contact` ON `contact`.`id` = `thread`.`contact-id`
-                               AND NOT `contact`.`blocked`
+                               AND (NOT `contact`.`blocked` OR `contact`.`pending`)
                                WHERE `thread`.`uid` = %d AND `thread`.`visible` AND NOT `thread`.`deleted`
                                AND NOT `thread`.`moderated`
                                $sql_extra2 $sql_extra3 $sql_extra $sql_nets