Merge pull request #3743 from MrPetovan/task/update-languagedetect

[friendica.git] / mod / photo.php

diff --git a/mod/photo.php b/mod/photo.php
index a94a3ac2ce57eb97f260689e6cb699b2766ce94f..5896c90baa9690c773fc1eb372a2a63a70e19142 100644 (file)
--- a/mod/photo.php
+++ b/mod/photo.php
@@ -1,9 +1,11 @@
 <?php
 
+use Friendica\App;
+
 require_once('include/security.php');
 require_once('include/Photo.php');
 
-function photo_init(&$a) {
+function photo_init(App $a) {
        global $_SERVER;
 
        $prvcachecontrol = false;
@@ -72,7 +74,7 @@ function photo_init(&$a) {
 
                $uid = str_replace(array('.jpg','.png'),array('',''), $person);
 
-               $r = qu("SELECT * FROM `photo` WHERE `scale` = %d AND `uid` = %d AND `profile` = 1 LIMIT 1",
+               $r = q("SELECT * FROM `photo` WHERE `scale` = %d AND `uid` = %d AND `profile` = 1 LIMIT 1",
                        intval($resolution),
                        intval($uid)
                );
@@ -102,7 +104,7 @@ function photo_init(&$a) {
                }
 
         // check if the photo exists and get the owner of the photo
-               $r = qu("SELECT `uid` FROM `photo` WHERE `resource-id` = '%s' LIMIT 1",
+               $r = q("SELECT `uid` FROM `photo` WHERE `resource-id` = '%s' LIMIT 1",
                        dbesc($photo),
                        intval($resolution)
                );
@@ -112,12 +114,12 @@ function photo_init(&$a) {
 
                        // Now we'll see if we can access the photo
 
-                       $r = qu("SELECT * FROM `photo` WHERE `resource-id` = '%s' AND `scale` <= %d $sql_extra ORDER BY scale DESC LIMIT 1",
+                       $r = q("SELECT * FROM `photo` WHERE `resource-id` = '%s' AND `scale` <= %d $sql_extra ORDER BY scale DESC LIMIT 1",
                                dbesc($photo),
                                intval($resolution)
                        );
 
-                       $public = (dbm::is_result($r)) AND ($r[0]['allow_cid'] == '') AND ($r[0]['allow_gid'] == '') AND ($r[0]['deny_cid']  == '') AND ($r[0]['deny_gid']  == '');
+                       $public = (dbm::is_result($r)) && ($r[0]['allow_cid'] == '') && ($r[0]['allow_gid'] == '') && ($r[0]['deny_cid']  == '') && ($r[0]['deny_gid']  == '');
 
                        if (dbm::is_result($r)) {
                                $resolution = $r[0]['scale'];