mirror of
https://github.com/friendica/friendica
synced 2025-03-17 08:28:27 +00:00
Merge pull request #13970 from MrPetovan/bug/warnings
Address a couple of warnings
This commit is contained in:
commit
54852ecb56
2 changed files with 3 additions and 3 deletions
|
@ -1039,7 +1039,7 @@ function photos_content(App $a)
|
||||||
$pager = new Pager(DI::l10n(), DI::args()->getQueryString());
|
$pager = new Pager(DI::l10n(), DI::args()->getQueryString());
|
||||||
|
|
||||||
$params = ['order' => ['id'], 'limit' => [$pager->getStart(), $pager->getItemsPerPage()]];
|
$params = ['order' => ['id'], 'limit' => [$pager->getStart(), $pager->getItemsPerPage()]];
|
||||||
$items = Post::toArray(Post::selectForUser($link_item['uid'], Item::ITEM_FIELDLIST, $condition, $params));
|
$items = Post::toArray(Post::selectForUser($link_item['uid'], array_merge(Item::ITEM_FIELDLIST, ['author-alias']), $condition, $params));
|
||||||
|
|
||||||
if (DI::userSession()->getLocalUserId() == $link_item['uid']) {
|
if (DI::userSession()->getLocalUserId() == $link_item['uid']) {
|
||||||
Item::update(['unseen' => false], ['parent' => $link_item['parent']]);
|
Item::update(['unseen' => false], ['parent' => $link_item['parent']]);
|
||||||
|
|
|
@ -52,7 +52,7 @@ class Counts
|
||||||
} elseif ($verb == Activity::POST) {
|
} elseif ($verb == Activity::POST) {
|
||||||
$condition['gravity'] = Item::GRAVITY_COMMENT;
|
$condition['gravity'] = Item::GRAVITY_COMMENT;
|
||||||
$body = '';
|
$body = '';
|
||||||
} elseif (($verb != Activity::POST) && (mb_strlen($body) == 1) && Smilies::isEmojiPost($body)) {
|
} elseif ($body && mb_strlen($body) == 1 && Smilies::isEmojiPost($body)) {
|
||||||
$condition['body'] = $body;
|
$condition['body'] = $body;
|
||||||
} else {
|
} else {
|
||||||
$body = '';
|
$body = '';
|
||||||
|
|
Loading…
Add table
Reference in a new issue