diff options
| author | Mario Vavti <mario@mariovavti.com> | 2018-10-08 11:05:53 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2018-10-08 11:05:53 +0200 |
| commit | a00aae702d1fd933d517243d7e555ed4428b9cba (patch) | |
| tree | 6def750e8411b33b9b9e200764d94833c91c577d /Zotlabs | |
| parent | 855f4b869a039535a35ba7e5a62867fbc953c1af (diff) | |
| parent | 69584f541d052e6da410d9cd782656eb31fae22d (diff) | |
| download | volse-hubzilla-a00aae702d1fd933d517243d7e555ed4428b9cba.tar.gz volse-hubzilla-a00aae702d1fd933d517243d7e555ed4428b9cba.tar.bz2 volse-hubzilla-a00aae702d1fd933d517243d7e555ed4428b9cba.zip | |
Merge remote-tracking branch 'mike/master' into dev
Diffstat (limited to 'Zotlabs')
| -rw-r--r-- | Zotlabs/Module/Display.php | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Zotlabs/Module/Display.php b/Zotlabs/Module/Display.php index 8b46ebb79..d1755c183 100644 --- a/Zotlabs/Module/Display.php +++ b/Zotlabs/Module/Display.php @@ -12,7 +12,7 @@ class Display extends \Zotlabs\Web\Controller { function get($update = 0, $load = false) { - $noscript_content = get_config('system', 'noscript_content', '1'); + $noscript_content = (get_config('system', 'noscript_content', '1') && (! $update)); $module_format = 'html'; @@ -299,7 +299,6 @@ class Display extends \Zotlabs\Web\Controller { require_once('include/channel.php'); $sys = get_sys_channel(); $sysid = $sys['channel_id']; - if(local_channel()) { $r = q("SELECT item.parent AS item_id from item WHERE uid = %d @@ -340,7 +339,7 @@ class Display extends \Zotlabs\Web\Controller { else { $r = array(); } - + if($r) { $parents_str = ids_to_querystr($r,'item_id'); if($parents_str) { |