diff options
| author | friendica <info@friendica.com> | 2013-12-17 16:36:23 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2013-12-17 16:36:23 -0800 |
| commit | 1d82d93078df13de1fec0eeb628b9dfb949e9706 (patch) | |
| tree | f41d10f64b1b62cfba50b6f18b51cc789d20d8bc /mod/display.php | |
| parent | 44ead61339745b975d4cff60894afb18b83fa55f (diff) | |
| parent | 26667ffd4fbc58823a0940e0a0d2894a621bb76e (diff) | |
| download | volse-hubzilla-1d82d93078df13de1fec0eeb628b9dfb949e9706.tar.gz volse-hubzilla-1d82d93078df13de1fec0eeb628b9dfb949e9706.tar.bz2 volse-hubzilla-1d82d93078df13de1fec0eeb628b9dfb949e9706.zip | |
Merge https://github.com/friendica/red into zpull
Diffstat (limited to 'mod/display.php')
| -rw-r--r-- | mod/display.php | 11 |
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 ) |