diff options
| author | friendica <info@friendica.com> | 2013-12-09 13:44:45 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2013-12-09 13:44:45 -0800 |
| commit | 31efbe2f466a323609f9ed8d38bb5fb6223e406b (patch) | |
| tree | 1f94498070825bce916bdd68cf0c0eaf85307fad /mod | |
| parent | f8e19271502035473197c8bf1b4cd267aa827851 (diff) | |
| parent | 3c19d9aed213b28f1c07809c193f98759b09cbf7 (diff) | |
| download | volse-hubzilla-31efbe2f466a323609f9ed8d38bb5fb6223e406b.tar.gz volse-hubzilla-31efbe2f466a323609f9ed8d38bb5fb6223e406b.tar.bz2 volse-hubzilla-31efbe2f466a323609f9ed8d38bb5fb6223e406b.zip | |
Merge https://github.com/friendica/red into zpull
Diffstat (limited to 'mod')
| -rw-r--r-- | mod/channel.php | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/mod/channel.php b/mod/channel.php index 2014cd08b..7879f72ee 100644 --- a/mod/channel.php +++ b/mod/channel.php @@ -189,7 +189,7 @@ function channel_content(&$a, $update = 0, $load = false) { $a->set_pager_itemspage(((intval($itemspage)) ? $itemspage : 20)); $pager_sql = sprintf(" LIMIT %d, %d ",intval($a->pager['start']), intval($a->pager['itemspage'])); - if($load) { + if($load || ($_COOKIE['jsAvailable'] != 1)) { $r = q("SELECT distinct id AS item_id FROM item left join abook on item.author_xchan = abook.abook_xchan WHERE uid = %d AND item_restrict = 0 @@ -281,9 +281,13 @@ function channel_content(&$a, $update = 0, $load = false) { } - $o .= conversation($a,$items,'channel',$update,'client'); + if($_COOKIE['jsAvailable'] == 1) { + $o .= conversation($a,$items,'channel',$update,'client'); + } else { + $o .= conversation($a,$items,'channel',$update,'traditional'); + } - if(! $update) + if((! $update) || ($_COOKIE['jsAvailable'] != 1)) $o .= alt_pager($a,count($items)); return $o; |