aboutsummaryrefslogtreecommitdiffstats
path: root/mod/channel.php
diff options
context:
space:
mode:
authorHabeas Codice <habeascodice@federated.social>2014-11-17 15:15:02 -0800
committerHabeas Codice <habeascodice@federated.social>2014-11-17 15:15:02 -0800
commit96427a23a3523daf2c1966fe1b8a6e119e797e50 (patch)
treea7aaea69271817bbc8f78396f0d98052ca52d3f3 /mod/channel.php
parentbcaa32a83a965f111bfc2ba085a59857a4fa0c2d (diff)
parente59f7cc198fb038cd8344c2d403b423d57300a96 (diff)
downloadvolse-hubzilla-96427a23a3523daf2c1966fe1b8a6e119e797e50.tar.gz
volse-hubzilla-96427a23a3523daf2c1966fe1b8a6e119e797e50.tar.bz2
volse-hubzilla-96427a23a3523daf2c1966fe1b8a6e119e797e50.zip
Merge branch 'master' of https://github.com/habeascodice/red
Diffstat (limited to 'mod/channel.php')
-rw-r--r--mod/channel.php8
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');
}