Fix overly strict return value for terminateFriendship methods

[friendica.git] / mod / fbrowser.php

diff --git a/mod/fbrowser.php b/mod/fbrowser.php
index e8b356d08f3cdf432256499b353a4beba05ff00f..45e960feceb828fbfd5e43f1bcc9b085f27701d5 100644 (file)
--- a/mod/fbrowser.php
+++ b/mod/fbrowser.php
@@ -79,16 +79,11 @@ function fbrowser_content(App $a)
                                $filename_e = $rr['filename'];
 
                                // Take the largest picture that is smaller or equal 640 pixels
-                               $p = q("SELECT `scale` FROM `photo` WHERE `resource-id` = '%s' AND `height` <= 640 AND `width` <= 640 ORDER BY `resource-id`, `scale` LIMIT 1",
-                                       DBA::escape($rr['resource-id']));
-                               if ($p) {
-                                       $scale = $p[0]["scale"];
-                               } else {
-                                       $scale = $rr['loq'];
-                               }
+                               $photo = Photo::selectFirst(['scale'], ["`resource-id` = ? AND `height` <= ? AND `width` <= ?", $rr['resource-id'], 640, 640], ['order' => ['scale']]);
+                               $scale = $photo['scale'] ?? $rr['loq'];
 
                                return [
-                                       DI::baseUrl() . '/photos/' . $a->user['nickname'] . '/image/' . $rr['resource-id'],
+                                       DI::baseUrl() . '/photos/' . $a->getLoggedInUserNickname() . '/image/' . $rr['resource-id'],
                                        $filename_e,
                                        DI::baseUrl() . '/photo/' . $rr['resource-id'] . '-' . $scale . '.'. $ext
                                ];
@@ -103,16 +98,14 @@ function fbrowser_content(App $a)
                                '$folders'  => $albums,
                                '$files'    => $files,
                                '$cancel'   => DI::l10n()->t('Cancel'),
-                               '$nickname' => $a->user['nickname'],
+                               '$nickname' => $a->getLoggedInUserNickname(),
                                '$upload'   => DI::l10n()->t('Upload')
                        ]);
 
                        break;
                case "file":
                        if (DI::args()->getArgc()==2) {
-                               $files = q("SELECT `id`, `filename`, `filetype` FROM `attach` WHERE `uid` = %d ",
-                                       intval(local_user())
-                               );
+                               $files = DBA::selectToArray('attach', ['id', 'filename', 'filetype'], ['uid' => local_user()]);
 
                                function _map_files2($rr)
                                {
@@ -132,7 +125,7 @@ function fbrowser_content(App $a)
                                        '$folders'  => false,
                                        '$files'    => $files,
                                        '$cancel'   => DI::l10n()->t('Cancel'),
-                                       '$nickname' => $a->user['nickname'],
+                                       '$nickname' => $a->getLoggedInUserNickname(),
                                        '$upload'   => DI::l10n()->t('Upload')
                                ]);
                        }