Merge pull request #3047 from annando/1612-indexlength

[friendica.git] / mod / photo.php

diff --git a/mod/photo.php b/mod/photo.php
index 3baff13db5d7c03592d01bc3b8b73d7a0fa142cd..a94a3ac2ce57eb97f260689e6cb699b2766ce94f 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,11 +72,11 @@ 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)
                );
-               if(count($r)) {
+               if (dbm::is_result($r)) {
                        $data = $r[0]['data'];
                        $mimetype = $r[0]['type'];
                }
@@ -103,24 +102,24 @@ 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)
                );
-               if(count($r)) {
+               if (dbm::is_result($r)) {
 
                        $sql_extra = permissions_sql($r[0]['uid']);
 
                        // 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)
                        );
 
-                       $public = ($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(count($r)) {
+                       if (dbm::is_result($r)) {
                                $resolution = $r[0]['scale'];
                                $data = $r[0]['data'];
                                $mimetype = $r[0]['type'];
@@ -210,4 +209,3 @@ function photo_init(&$a) {
        killme();
        // NOTREACHED
 }
-}