X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fnetwork.php;h=fddec60c8dc86457e1273d551adb2d766e63babb;hb=5f2028b657332c7dceb1e14dc0e1cd175fc61a7c;hp=7753ba2ca4f1373e3e09a750f48e17c8ced43e0c;hpb=64f51d337f3999afe234537c3704211656718462;p=friendica.git

diff --git a/mod/network.php b/mod/network.php
index 7753ba2ca4..fddec60c8d 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -19,6 +19,7 @@ use Friendica\Core\Logger;
 use Friendica\Core\PConfig;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
+use Friendica\Core\Session;
 use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Model\Group;
@@ -642,7 +643,7 @@ function networkThreadedView(App $a, $update, $parent)
 			// NOTREACHED
 		}
 
-		$contacts = Group::expand([$gid]);
+		$contacts = Group::expand(local_user(), [$gid]);
 
 		if ((is_array($contacts)) && count($contacts)) {
 			$contact_str_self = '';
@@ -703,11 +704,11 @@ function networkThreadedView(App $a, $update, $parent)
 	}
 
 	if ($datequery) {
-		$sql_extra3 .= Strings::protectSprintf(sprintf(" AND $sql_table.created <= '%s' ",
+		$sql_extra3 .= Strings::protectSprintf(sprintf(" AND $sql_table.received <= '%s' ",
 				DBA::escape(DateTimeFormat::convert($datequery, 'UTC', date_default_timezone_get()))));
 	}
 	if ($datequery2) {
-		$sql_extra3 .= Strings::protectSprintf(sprintf(" AND $sql_table.created >= '%s' ",
+		$sql_extra3 .= Strings::protectSprintf(sprintf(" AND $sql_table.received >= '%s' ",
 				DBA::escape(DateTimeFormat::convert($datequery2, 'UTC', date_default_timezone_get()))));
 	}
 
@@ -717,8 +718,8 @@ function networkThreadedView(App $a, $update, $parent)
 
 	// Normal conversation view
 	if ($order === 'post') {
-		$ordering = '`created`';
-		$order_mode = 'created';
+		$ordering = '`received`';
+		$order_mode = 'received';
 	} else {
 		$ordering = '`commented`';
 		$order_mode = 'commented';
@@ -852,7 +853,7 @@ function networkThreadedView(App $a, $update, $parent)
 			((time() - $_SESSION['network_last_date_timestamp']) < ($browser_update * 10))) {
 			$bottom_limit = $_SESSION['network_last_date'];
 		}
-		$_SESSION['network_last_date'] = defaults($_SESSION, 'network_last_top_limit', $top_limit);
+		$_SESSION['network_last_date'] = Session::get('network_last_top_limit', $top_limit);
 		$_SESSION['network_last_date_timestamp'] = time();
 
 		if ($last_date > $top_limit) {
@@ -867,10 +868,10 @@ function networkThreadedView(App $a, $update, $parent)
 				(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 `contact` AS `author` ON `author`.`id` = `item`.`author-id`
-			WHERE `item`.`uid` = 0 AND `item`.$ordering < ? AND `item`.$ordering > ?
+			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_OBJ_POST, TERM_HASHTAG,
-			$top_limit, $bottom_limit);
+			$top_limit, $bottom_limit, GRAVITY_PARENT);
 
 		$data = DBA::toArray($items);