bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

Merge pull request #5626 from annando/notices-oh-yeah

Browse source 
Removed notices, will it ever end?
This commit is contained in:
Tobias Diekershoff 2018-08-17 09:33:02 +02:00 • committed by GitHub
commit d5c2c41b02
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 21 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
mod/network.php
View file

@ -449,7 +449,7 @@ function networkFlatView(App $a, $update = 0)
while ($term = DBA::fetch($result)) {
$posts[] = $term['oid'];
}
DBA::close($terms);
DBA::close($result);
$condition = ['uid' => local_user(), 'id' => $posts];
} else {

2
mod/smilies.php
View file

@ -13,7 +13,7 @@ use Friendica\Core\System;
function smilies_content(App $a)
{
$smilies = Smilies::getList();
if ($a->argv[1] === "json") {
if (!empty($a->argv[1]) && ($a->argv[1] === "json")) {
$results = [];
for ($i = 0; $i < count($smilies['texts']); $i++) {
$results[] = ['text' => $smilies['texts'][$i], 'icon' => $smilies['icons'][$i]];