aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-12-17 16:09:36 -0800
committerfriendica <info@friendica.com>2013-12-17 16:09:36 -0800
commit26667ffd4fbc58823a0940e0a0d2894a621bb76e (patch)
treeeae321e2360fcc5a9570f089dcac4303a56730ec
parent9728a1303d4cd6b6cb8866eb79194b2d698b9961 (diff)
parentb3e3073b991c2ee898b0d8f4edd2df221a538631 (diff)
downloadvolse-hubzilla-26667ffd4fbc58823a0940e0a0d2894a621bb76e.tar.gz
volse-hubzilla-26667ffd4fbc58823a0940e0a0d2894a621bb76e.tar.bz2
volse-hubzilla-26667ffd4fbc58823a0940e0a0d2894a621bb76e.zip
Merge pull request #244 from zzottel/master
JS-less display module
-rw-r--r--mod/display.php11
1 files changed, 7 insertions, 4 deletions
diff --git a/mod/display.php b/mod/display.php
index 9aafec8c3..65114272a 100644
--- a/mod/display.php
+++ b/mod/display.php
@@ -139,13 +139,13 @@ function display_content(&$a, $update = 0, $load = false) {
$sql_extra = public_permissions_sql(get_observer_hash());
- if($update && $load) {
+ if(($update && $load) || ($_COOKIE['jsAvailable'] != 1)) {
$updateable = false;
$pager_sql = sprintf(" LIMIT %d, %d ",intval($a->pager['start']), intval($a->pager['itemspage']));
- if($load) {
+ if($load || ($_COOKIE['jsAvailable'] != 1)) {
$r = null;
if(local_user()) {
$r = q("SELECT * from item
@@ -202,8 +202,11 @@ function display_content(&$a, $update = 0, $load = false) {
}
-
- $o .= conversation($a, $items, 'display', $update, 'client');
+ if ($_COOKIE['jsAvailable'] == 1) {
+ $o .= conversation($a, $items, 'display', $update, 'client');
+ } else {
+ $o .= conversation($a, $items, 'display', $update, 'traditional');
+ }
if($updateable) {
$x = q("UPDATE item SET item_flags = ( item_flags ^ %d )