harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sql error photos_albums_list with non-logged-in viewer

Browse Source
This commit is contained in:
zotlabs 2017-04-02 22:20:37 -07:00 committed by Mario Vavti
parent 5fb7ea8dbd
commit a9bda2b12e
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Zotlabs/Widget/Photo_albums.php
View File

@ -16,7 +16,7 @@ class Photo_albums {
if((! $channelx) || (! perm_is_allowed(\App::$profile['profile_uid'], get_observer_hash(), 'view_storage'))) if((! $channelx) || (! perm_is_allowed(\App::$profile['profile_uid'], get_observer_hash(), 'view_storage')))
return ''; 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'); $direction = ((array_key_exists('direction',$arr)) ? $arr['direction'] : 'asc');
return photos_album_widget($channelx, \App::get_observer(),$sortkey,$direction); return photos_album_widget($channelx, \App::get_observer(),$sortkey,$direction);

7
include/items.php
View File

@ -1826,9 +1826,12 @@ logger('revision: ' . $arr['revision']);
intval($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']; $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); logger('item_store: created item ' . $current_post, LOGGER_DEBUG);
} }
else { else {