]> git.mxchange.org Git - friendica.git/commitdiff
Throw not found exception when photo item doesn't exist in prepare_photo_data()
authorHypolite Petovan <hypolite@mrpetovan.com>
Sun, 26 Jan 2020 21:43:14 +0000 (16:43 -0500)
committerHypolite Petovan <hypolite@mrpetovan.com>
Sun, 26 Jan 2020 21:43:14 +0000 (16:43 -0500)
- Addresses part of https://github.com/friendica/friendica/issues/8000#issuecomment-573883153

include/api.php

index 92b4e4b218548ae72ef04ca610e3bab14b245a53..43659db079a6fe974276716d45ba3c76464b9c75 100644 (file)
@@ -311,9 +311,7 @@ function api_call(App $a, App\Arguments $args = null)
                                }
 
                                $called_api = explode("/", $p);
-                               //unset($_SERVER['PHP_AUTH_USER']);
 
-                               /// @TODO should be "true ==[=] $info['auth']", if you miss only one = character, you assign a variable (only with ==). Let's make all this even.
                                if (!empty($info['auth']) && api_user() === false) {
                                        api_login($a);
                                }
@@ -5027,6 +5025,9 @@ function prepare_photo_data($type, $scale, $photo_id)
        // retrieve item element for getting activities (like, dislike etc.) related to photo
        $condition = ['uid' => local_user(), 'resource-id' => $photo_id, 'type' => 'photo'];
        $item = Item::selectFirstForUser(local_user(), ['id'], $condition);
+       if (!DBA::isResult($item)) {
+               throw new NotFoundException('Photo-related item not found.');
+       }
 
        $data['photo']['friendica_activities'] = api_format_items_activities($item, $type);