diff options
| author | Mario Vavti <mario@mariovavti.com> | 2017-08-19 14:31:47 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2017-08-19 14:31:47 +0200 |
| commit | 4cafa6280d6e1a8e550246a27e807c4768e06f9a (patch) | |
| tree | 3eb0b741acbb37543307d672fa5e2052573a5128 /Zotlabs/Module/Display.php | |
| parent | b18f3f4f7adb8f4d49dac1bb4b8b6c21255cbecb (diff) | |
| parent | b4880343524aab6b4583c6815d94a5dfe61dd042 (diff) | |
| download | volse-hubzilla-4cafa6280d6e1a8e550246a27e807c4768e06f9a.tar.gz volse-hubzilla-4cafa6280d6e1a8e550246a27e807c4768e06f9a.tar.bz2 volse-hubzilla-4cafa6280d6e1a8e550246a27e807c4768e06f9a.zip | |
Merge remote-tracking branch 'mike/master' into dev
Diffstat (limited to 'Zotlabs/Module/Display.php')
| -rw-r--r-- | Zotlabs/Module/Display.php | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/Zotlabs/Module/Display.php b/Zotlabs/Module/Display.php index 81c72adb3..b054d9edf 100644 --- a/Zotlabs/Module/Display.php +++ b/Zotlabs/Module/Display.php @@ -324,12 +324,8 @@ class Display extends \Zotlabs\Web\Controller { } $o .= '<div id="content-complete"></div>'; - - return $o; - - - /* - elseif((! $update) && (! { + + if((! $update) && (! $items)) { $r = q("SELECT id, item_flags FROM item WHERE id = '%s' OR mid = '%s' LIMIT 1", dbesc($item_hash), @@ -348,7 +344,9 @@ class Display extends \Zotlabs\Web\Controller { } } - */ + + return $o; + } |