From cfd2e7f6869bf9bfd64e510f1361fb7189fe80d3 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Mon, 29 Jul 2019 13:37:54 -0400 Subject: [PATCH 1/2] Replace removed Photo::select by new Photo::selectToArray in /profile_photo --- mod/profile_photo.php | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/mod/profile_photo.php b/mod/profile_photo.php index a0faa40cf5..97d2da349c 100644 --- a/mod/profile_photo.php +++ b/mod/profile_photo.php @@ -192,14 +192,7 @@ function profile_photo_content(App $a) $resource_id = $a->argv[2]; //die(":".local_user()); - $r = Photo::select([], ["resource-id" => $resource_id, "uid" => local_user()], ["order" => ["scale"=>false]]); - - /* - $r = q("SELECT * FROM `photo` WHERE `uid` = %d AND `resource-id` = '%s' ORDER BY `scale` ASC", intval(local_user()), - DBA::escape($resource_id) - ); - */ - + $r = Photo::selectToArray([], ["resource-id" => $resource_id, "uid" => local_user()], ["order" => ["scale" => false]]); if (!DBA::isResult($r)) { notice(L10n::t('Permission denied.') . EOL); return; From e745506c04cfa182aaf29275de9d8d6eb046667c Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Mon, 29 Jul 2019 13:38:55 -0400 Subject: [PATCH 2/2] Replace removed Photo::select by new Photo::selectToArray in /photos --- mod/photos.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/photos.php b/mod/photos.php index 1ccfecdefe..fa4d5b2814 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -635,7 +635,7 @@ function photos_post(App $a) * they acquire comments, likes, dislikes, and/or tags */ - $r = Photo::select([], ['`album` = ? AND `uid` = ? AND `created` > UTC_TIMESTAMP() - INTERVAL 3 HOUR', $album, $page_owner_uid]); + $r = Photo::selectToArray([], ['`album` = ? AND `uid` = ? AND `created` > UTC_TIMESTAMP() - INTERVAL 3 HOUR', $album, $page_owner_uid]); if (!DBA::isResult($r) || ($album == L10n::t('Profile Photos'))) { $visible = 1;