Merge pull request #3518 from AndyHee/3.5.2rc

[friendica.git] / mod / photo.php

diff --git a/mod/photo.php b/mod/photo.php
index 54c9776bb888d061ba0c64de929c90d5a9563f49..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;
@@ -117,7 +119,7 @@ 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)) {
                                $resolution = $r[0]['scale'];
@@ -197,7 +199,7 @@ function photo_init(&$a) {
        // If the photo is public and there is an existing photo directory store the photo there
        if ($public and ($file != "")) {
                // If the photo path isn't there, try to create it
-               $basepath = App::get_basepath();
+               $basepath = $a->get_basepath();
                if (!is_dir($basepath."/photo"))
                        if (is_writable($basepath))
                                mkdir($basepath."/photo");