Merge pull request #3500 from AndyHee/3.5.2rc

[friendica.git] / mod / photo.php

diff --git a/mod/photo.php b/mod/photo.php
index fc9d9f1748f645183b0344dbc94d24b0acea375d..7506834cf502b27513371e42ec4dc6831adbd8de 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;
@@ -76,7 +78,7 @@ function photo_init(&$a) {
                        intval($resolution),
                        intval($uid)
                );
-               if(dbm::is_result($r)) {
+               if (dbm::is_result($r)) {
                        $data = $r[0]['data'];
                        $mimetype = $r[0]['type'];
                }
@@ -106,7 +108,7 @@ function photo_init(&$a) {
                        dbesc($photo),
                        intval($resolution)
                );
-               if(dbm::is_result($r)) {
+               if (dbm::is_result($r)) {
 
                        $sql_extra = permissions_sql($r[0]['uid']);
 
@@ -117,9 +119,9 @@ function photo_init(&$a) {
                                intval($resolution)
                        );
 
-                       $public = (dbm::is_result($r)) && ($r[0]['allow_cid'] == '') AND ($r[0]['allow_gid'] == '') AND ($r[0]['deny_cid']  == '') AND ($r[0]['deny_gid']  == '');
+                       $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']  == '');
 
-                       if(dbm::is_result($r)) {
+                       if (dbm::is_result($r)) {
                                $resolution = $r[0]['scale'];
                                $data = $r[0]['data'];
                                $mimetype = $r[0]['type'];