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

Merge https://github.com/friendica/red into zpull

Browse source
This commit is contained in:
friendica 2013-12-17 16:36:23 -08:00
commit 1d82d93078
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
mod/display.php
View file

@ -139,13 +139,13 @@ function display_content(&$a, $update = 0, $load = false) {
$sql_extra = public_permissions_sql(get_observer_hash()); $sql_extra = public_permissions_sql(get_observer_hash());
if($update && $load) { if(($update && $load) || ($_COOKIE['jsAvailable'] != 1)) {
$updateable = false; $updateable = false;
$pager_sql = sprintf(" LIMIT %d, %d ",intval($a->pager['start']), intval($a->pager['itemspage'])); $pager_sql = sprintf(" LIMIT %d, %d ",intval($a->pager['start']), intval($a->pager['itemspage']));
if($load) { if($load || ($_COOKIE['jsAvailable'] != 1)) {
$r = null; $r = null;
if(local_user()) { if(local_user()) {
$r = q("SELECT * from item $r = q("SELECT * from item
@ -202,8 +202,11 @@ function display_content(&$a, $update = 0, $load = false) {
} }
if ($_COOKIE['jsAvailable'] == 1) {
$o .= conversation($a, $items, 'display', $update, 'client'); $o .= conversation($a, $items, 'display', $update, 'client');
} else {
$o .= conversation($a, $items, 'display', $update, 'traditional');
}
if($updateable) { if($updateable) {
$x = q("UPDATE item SET item_flags = ( item_flags ^ %d ) $x = q("UPDATE item SET item_flags = ( item_flags ^ %d )