diff options
| author | Mario Vavti <mario@mariovavti.com> | 2017-08-20 16:17:14 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2017-08-20 16:17:14 +0200 |
| commit | 17e81095b3495bf2e0601a7e94b6c4ec094f26df (patch) | |
| tree | 1f1dc42daaf92d18e35e1289a6eea7ac09ba9f17 | |
| parent | 4cafa6280d6e1a8e550246a27e807c4768e06f9a (diff) | |
| parent | ed71afa6c7ada8ae972474f1846932032c782a94 (diff) | |
| download | volse-hubzilla-17e81095b3495bf2e0601a7e94b6c4ec094f26df.tar.gz volse-hubzilla-17e81095b3495bf2e0601a7e94b6c4ec094f26df.tar.bz2 volse-hubzilla-17e81095b3495bf2e0601a7e94b6c4ec094f26df.zip | |
Merge remote-tracking branch 'mike/master' into dev
| -rw-r--r-- | Zotlabs/Module/Display.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Zotlabs/Module/Display.php b/Zotlabs/Module/Display.php index b054d9edf..d9f623d8d 100644 --- a/Zotlabs/Module/Display.php +++ b/Zotlabs/Module/Display.php @@ -324,8 +324,9 @@ class Display extends \Zotlabs\Web\Controller { } $o .= '<div id="content-complete"></div>'; + - if((! $update) && (! $items)) { + if((($update && $load) || $checkjs->disabled()) && (! $items)) { $r = q("SELECT id, item_flags FROM item WHERE id = '%s' OR mid = '%s' LIMIT 1", dbesc($item_hash), |