diff options
| author | Habeas Codice <habeascodice@federated.social> | 2014-11-17 03:20:20 -0800 |
|---|---|---|
| committer | Habeas Codice <habeascodice@federated.social> | 2014-11-17 03:20:20 -0800 |
| commit | 333f3b17152475e780cc5a9fbedaf3b03dfb2cce (patch) | |
| tree | 8aaa0a8cd7ddc00630c38a85121124e824e35e7b /mod/channel.php | |
| parent | 2dbecf95454993cdf4996d2d65463d7759cd479b (diff) | |
| parent | b11ed7f88e4683315a4f5aa02692cb61facf32a7 (diff) | |
| download | volse-hubzilla-333f3b17152475e780cc5a9fbedaf3b03dfb2cce.tar.gz volse-hubzilla-333f3b17152475e780cc5a9fbedaf3b03dfb2cce.tar.bz2 volse-hubzilla-333f3b17152475e780cc5a9fbedaf3b03dfb2cce.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'mod/channel.php')
| -rw-r--r-- | mod/channel.php | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/mod/channel.php b/mod/channel.php index 8d6b2a169..1cc2dc02c 100644 --- a/mod/channel.php +++ b/mod/channel.php @@ -293,8 +293,14 @@ function channel_content(&$a, $update = 0, $load = false) { } + if(get_pconfig($a->profile['profile_uid'],'system','channel_list_mode')) + $page_mode = 'list'; + else + $page_mode = 'client'; + + if($_COOKIE['jsAvailable'] == 1) { - $o .= conversation($a,$items,'channel',$update,'client'); + $o .= conversation($a,$items,'channel',$update,$page_mode); } else { $o .= conversation($a,$items,'channel',$update,'traditional'); } |