aboutsummaryrefslogtreecommitdiffstats
path: root/include/Photo.php
diff options
context:
space:
mode:
authorThomas Willingham <founder@kakste.com>2012-12-07 22:27:35 +0000
committerThomas Willingham <founder@kakste.com>2012-12-07 22:27:35 +0000
commit44263d5ac3e5189df28c92f58c2875137052b6ea (patch)
tree70aa75426f2b3c984faecdb5f684157bccedda3a /include/Photo.php
parent555226ada4946b78be5fa2966f5c8532a997953f (diff)
parent2452b822f909a3cac432a76d8c928733a7683c6a (diff)
downloadvolse-hubzilla-44263d5ac3e5189df28c92f58c2875137052b6ea.tar.gz
volse-hubzilla-44263d5ac3e5189df28c92f58c2875137052b6ea.tar.bz2
volse-hubzilla-44263d5ac3e5189df28c92f58c2875137052b6ea.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'include/Photo.php')
-rw-r--r--include/Photo.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/Photo.php b/include/Photo.php
index f77605b98..c3165cc9f 100644
--- a/include/Photo.php
+++ b/include/Photo.php
@@ -528,7 +528,7 @@ class Photo {
$x = q("select id from photo where `resource_id` = '%s' and uid = %d and `xchan` = '%s' and `scale` = %d limit 1",
dbesc($rid),
intval($uid),
- intval($xchan),
+ dbesc($xchan),
intval($scale)
);
if(count($x)) {