diff options
| author | zotlabs <mike@macgirvin.com> | 2017-04-02 22:20:37 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-04-02 22:20:37 -0700 |
| commit | 26125bcf0b8ce98fa4522f89792d7e77f25ff1ca (patch) | |
| tree | a41795b80623765cc36ba3dd3bfc5a8f47141e47 | |
| parent | 263efbfe39d36a7133fca82e8e689435255fd9e2 (diff) | |
| download | volse-hubzilla-26125bcf0b8ce98fa4522f89792d7e77f25ff1ca.tar.gz volse-hubzilla-26125bcf0b8ce98fa4522f89792d7e77f25ff1ca.tar.bz2 volse-hubzilla-26125bcf0b8ce98fa4522f89792d7e77f25ff1ca.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 ea72d1d4e..e3147dea4 100755 --- a/include/items.php +++ b/include/items.php @@ -1776,9 +1776,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 { |