diff options
| author | zotlabs <mike@macgirvin.com> | 2017-04-02 22:20:37 -0700 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2017-04-03 10:55:42 +0200 |
| commit | a9bda2b12e3d393fa854e23207a081052e2e7bfd (patch) | |
| tree | 2eed3379df931bccd56dd7be8e3a56394fa3e0f9 | |
| parent | 5fb7ea8dbd2d628fffc409c6bc78a76d603b5fcb (diff) | |
| download | volse-hubzilla-a9bda2b12e3d393fa854e23207a081052e2e7bfd.tar.gz volse-hubzilla-a9bda2b12e3d393fa854e23207a081052e2e7bfd.tar.bz2 volse-hubzilla-a9bda2b12e3d393fa854e23207a081052e2e7bfd.zip | |
sql error photos_albums_list with non-logged-in viewer
| -rw-r--r-- | Zotlabs/Widget/Photo_albums.php | 2 | ||||
| -rwxr-xr-x | include/items.php | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/Zotlabs/Widget/Photo_albums.php b/Zotlabs/Widget/Photo_albums.php index 2a746e492..6df8ddf3c 100644 --- a/Zotlabs/Widget/Photo_albums.php +++ b/Zotlabs/Widget/Photo_albums.php @@ -16,7 +16,7 @@ class Photo_albums { if((! $channelx) || (! perm_is_allowed(\App::$profile['profile_uid'], get_observer_hash(), 'view_storage'))) return ''; - $sortkey = ((array_key_exists('sortkey',$arr)) ? $arr['sortkey'] : 'album'); + $sortkey = ((array_key_exists('sortkey',$arr)) ? $arr['sortkey'] : 'display_path'); $direction = ((array_key_exists('direction',$arr)) ? $arr['direction'] : 'asc'); return photos_album_widget($channelx, \App::get_observer(),$sortkey,$direction); diff --git a/include/items.php b/include/items.php index 42661e2b1..933b9ef81 100755 --- a/include/items.php +++ b/include/items.php @@ -1826,9 +1826,12 @@ logger('revision: ' . $arr['revision']); intval($arr['revision']) ); - if($r && count($r)) { + if($r) { + // This will gives us a fresh copy of what's now in the DB and undo the db escaping, + // which really messes up the notifications + $current_post = $r[0]['id']; - $arr = $r[0]; // This will gives us a fresh copy of what's now in the DB and undo the db escaping, which really messes up the notifications + $arr = $r[0]; logger('item_store: created item ' . $current_post, LOGGER_DEBUG); } else { |