Streams/streams
Streams/streams
1
0
Fork 0
mirror of https://codeberg.org/streams/streams.git synced 2024-09-20 15:15:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'dev' of /home/macgirvin/z into dev

Browse source
This commit is contained in:
nobody 2021-05-20 19:34:32 -07:00
commit 177967e7ef
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Zotlabs/Module/Channel.php
View file

@ -181,7 +181,7 @@ class Channel extends Controller {
$noscript_content = get_config('system', 'noscript_content', '1');
if($load)
$_SESSION['loadtime_channel'] = datetime_convert();
$_SESSION['loadtime'] = datetime_convert();
$category = $datequery = $datequery2 = '';
@ -342,8 +342,8 @@ class Channel extends Controller {
'title' => 'oembed'
]);
if ($update && isset($_SESSION['loadtime_channel'])) {
$simple_update = " AND item.changed > '" . datetime_convert('UTC','UTC',$_SESSION['loadtime_channel']) . "' ";
if ($update && isset($_SESSION['loadtime'])) {
$simple_update = " AND (( item_unseen = 1 AND item.changed > '" . datetime_convert('UTC','UTC',$_SESSION['loadtime']) . "' ) OR item.changed > '" . datetime_convert('UTC','UTC',$_SESSION['loadtime']) . "' ) ";
}
if ($load) {
$simple_update = '';
@ -361,7 +361,7 @@ class Channel extends Controller {
dbesc($mid . '%'),
intval(App::$profile['profile_uid'])
);
$_SESSION['loadtime_channel'] = datetime_convert();
$_SESSION['loadtime'] = datetime_convert();
}
else {
$r = q("SELECT parent AS item_id from item
@ -373,7 +373,7 @@ class Channel extends Controller {
ORDER BY created DESC",
intval(App::$profile['profile_uid'])
);
$_SESSION['loadtime_channel'] = datetime_convert();
$_SESSION['loadtime'] = datetime_convert();
}
}

2
Zotlabs/Module/Stream.php
View file

@ -557,7 +557,7 @@ class Stream extends Controller {
if($order === 'post')
$ordering = "created";
else
$ordering = "changed";
$ordering = "commented";
if ($load) {
// Fetch a page full of parent items for this page