Merge pull request #2932 from Hypolite/issue/missing-private-image-src

[friendica.git] / mod / photo.php

diff --git a/mod/photo.php b/mod/photo.php
index 3baff13db5d7c03592d01bc3b8b73d7a0fa142cd..0d60282d5ffc19f7fa39d93f9edfb12722ba25dc 100644 (file)
--- a/mod/photo.php
+++ b/mod/photo.php
@@ -3,7 +3,6 @@
 require_once('include/security.php');
 require_once('include/Photo.php');
 
-if(! function_exists('photo_init')) {
 function photo_init(&$a) {
        global $_SERVER;
 
@@ -73,7 +72,7 @@ function photo_init(&$a) {
 
                $uid = str_replace(array('.jpg','.png'),array('',''), $person);
 
-               $r = q("SELECT * FROM `photo` WHERE `scale` = %d AND `uid` = %d AND `profile` = 1 LIMIT 1",
+               $r = qu("SELECT * FROM `photo` WHERE `scale` = %d AND `uid` = %d AND `profile` = 1 LIMIT 1",
                        intval($resolution),
                        intval($uid)
                );
@@ -103,7 +102,7 @@ function photo_init(&$a) {
                }
 
         // check if the photo exists and get the owner of the photo
-               $r = q("SELECT `uid` FROM `photo` WHERE `resource-id` = '%s' LIMIT 1",
+               $r = qu("SELECT `uid` FROM `photo` WHERE `resource-id` = '%s' LIMIT 1",
                        dbesc($photo),
                        intval($resolution)
                );
@@ -113,7 +112,7 @@ function photo_init(&$a) {
 
                        // Now we'll see if we can access the photo
 
-                       $r = q("SELECT * FROM `photo` WHERE `resource-id` = '%s' AND `scale` <= %d $sql_extra ORDER BY scale DESC LIMIT 1",
+                       $r = qu("SELECT * FROM `photo` WHERE `resource-id` = '%s' AND `scale` <= %d $sql_extra ORDER BY scale DESC LIMIT 1",
                                dbesc($photo),
                                intval($resolution)
                        );
@@ -210,4 +209,3 @@ function photo_init(&$a) {
        killme();
        // NOTREACHED
 }
-}