Replace remaining $a->isInstallMode() instances

[friendica.git] / src / Model / Photo.php

diff --git a/src/Model/Photo.php b/src/Model/Photo.php
index 4c297bc4ed853f7b2b48f2670f7a27c40e9599a3..555df80e63df689fea8f056f22586783857f0574 100644 (file)
--- a/src/Model/Photo.php
+++ b/src/Model/Photo.php
@@ -11,7 +11,6 @@ use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
-use Friendica\Database\DBM;
 use Friendica\Object\Image;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
@@ -42,7 +41,7 @@ class Photo
        public static function store(Image $Image, $uid, $cid, $rid, $filename, $album, $scale, $profile = 0, $allow_cid = '', $allow_gid = '', $deny_cid = '', $deny_gid = '', $desc = '')
        {
                $photo = DBA::selectFirst('photo', ['guid'], ["`resource-id` = ? AND `guid` != ?", $rid, '']);
-               if (DBM::is_result($photo)) {
+               if (DBA::isResult($photo)) {
                        $guid = $photo['guid'];
                } else {
                        $guid = System::createGUID();
@@ -73,7 +72,7 @@ class Photo
                        'desc' => $desc
                ];
 
-               if (DBM::is_result($existing_photo)) {
+               if (DBA::isResult($existing_photo)) {
                        $r = DBA::update('photo', $fields, ['id' => $existing_photo['id']]);
                } else {
                        $r = DBA::insert('photo', $fields);
@@ -240,8 +239,8 @@ class Photo
                                        WHERE `uid` = %d  AND `album` != '%s' AND `album` != '%s' $sql_extra
                                        GROUP BY `album` ORDER BY `created` DESC",
                                        intval($uid),
-                                       dbesc('Contact Photos'),
-                                       dbesc(L10n::t('Contact Photos'))
+                                       DBA::escape('Contact Photos'),
+                                       DBA::escape(L10n::t('Contact Photos'))
                                );
                        } else {
                                // This query doesn't do the count and is much faster
@@ -249,8 +248,8 @@ class Photo
                                        FROM `photo` USE INDEX (`uid_album_scale_created`)
                                        WHERE `uid` = %d  AND `album` != '%s' AND `album` != '%s' $sql_extra",
                                        intval($uid),
-                                       dbesc('Contact Photos'),
-                                       dbesc(L10n::t('Contact Photos'))
+                                       DBA::escape('Contact Photos'),
+                                       DBA::escape(L10n::t('Contact Photos'))
                                );
                        }
                        Cache::set($key, $albums, CACHE_DAY);