clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #13970 from MrPetovan/bug/warnings 

Address a couple of warnings
This commit is contained in:
Michael Vogel 2024-03-06 20:13:40 +01:00 committed by GitHub
parent b8b76e870d 8c4b2107b5
commit 54852ecb56
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mod/photos.php
View File

@ -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']]);

4
src/Model/Post/Counts.php
View File

@ -43,7 +43,7 @@ class Counts
Activity::EMOJIREACT, Activity::ANNOUNCE, Activity::VIEW, Activity::READ])) { Activity::EMOJIREACT, Activity::ANNOUNCE, Activity::VIEW, Activity::READ])) {
return true; return true;
} }
$condition = ['thr-parent-id' => $uri_id, 'vid' => $vid, 'deleted' => false]; $condition = ['thr-parent-id' => $uri_id, 'vid' => $vid, 'deleted' => false];
if ($body == $verb) { if ($body == $verb) {
@ -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 = '';