X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FUpdate%2FNetwork.php;h=6224d7c435e65e196ab53fb2a6eed877df3e1f83;hb=f609386ca11d805838f5526261068a69b489eab0;hp=3652b1126330ff22bd621d0438d62c220dd33ac8;hpb=3bae52074a644b0ade3808bed9fc1268e1baa4e3;p=friendica.git diff --git a/src/Module/Update/Network.php b/src/Module/Update/Network.php index 3652b11263..6224d7c435 100644 --- a/src/Module/Update/Network.php +++ b/src/Module/Update/Network.php @@ -1,18 +1,38 @@ . + * + */ namespace Friendica\Module\Update; use Friendica\Core\System; use Friendica\DI; +use Friendica\Model\Item; use Friendica\Model\Post; use Friendica\Module\Conversation\Network as NetworkModule; class Network extends NetworkModule { - public function rawContent() + protected function rawContent(array $request = []) { if (!isset($_GET['p']) || !isset($_GET['item'])) { - exit(); + System::exit(); } $this->parseRequest($_GET); @@ -36,7 +56,7 @@ class Network extends NetworkModule } elseif (self::$order === 'received') { // Only load new toplevel posts $conditionFields['unseen'] = true; - $conditionFields['gravity'] = GRAVITY_PARENT; + $conditionFields['gravity'] = Item::GRAVITY_PARENT; } else { // Load all unseen items $conditionFields['unseen'] = true; @@ -49,11 +69,13 @@ class Network extends NetworkModule if (self::$order === 'received') { $ordering = '`received`'; + } elseif (self::$order === 'created') { + $ordering = '`created`'; } else { $ordering = '`commented`'; } - $o = DI::conversation()->create($items, 'network', $profile_uid, false, $ordering, local_user()); + $o = DI::conversation()->create($items, 'network', $profile_uid, false, $ordering, DI::userSession()->getLocalUserId()); } System::htmlUpdateExit($o);