aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-12-09 13:44:45 -0800
committerfriendica <info@friendica.com>2013-12-09 13:44:45 -0800
commit31efbe2f466a323609f9ed8d38bb5fb6223e406b (patch)
tree1f94498070825bce916bdd68cf0c0eaf85307fad
parentf8e19271502035473197c8bf1b4cd267aa827851 (diff)
parent3c19d9aed213b28f1c07809c193f98759b09cbf7 (diff)
downloadvolse-hubzilla-31efbe2f466a323609f9ed8d38bb5fb6223e406b.tar.gz
volse-hubzilla-31efbe2f466a323609f9ed8d38bb5fb6223e406b.tar.bz2
volse-hubzilla-31efbe2f466a323609f9ed8d38bb5fb6223e406b.zip
Merge https://github.com/friendica/red into zpull
-rwxr-xr-xindex.php6
-rw-r--r--mod/channel.php10
2 files changed, 13 insertions, 3 deletions
diff --git a/index.php b/index.php
index 1953dd5cd..adfa6534f 100755
--- a/index.php
+++ b/index.php
@@ -245,6 +245,12 @@ if (file_exists($theme_info_file)){
if(! x($a->page,'content'))
$a->page['content'] = '';
+/* set JS cookie */
+if($_COOKIE['jsAvailable'] != 1) {
+ $a->page['content'] .= '<script>document.cookie="jsAvailable=1; path=/"; location.reload();</script>';
+}
+
+
if(! $install)
call_hooks('page_content_top',$a->page['content']);
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;