aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-08-27 21:30:45 -0700
committerfriendica <info@friendica.com>2013-08-27 21:30:45 -0700
commite8a0005d29244e4897ca7806f24424a8f63d1dd8 (patch)
tree85f3dbc0618ca15b25a1567348b793ddd284678d
parent7bb92899218a2a0de261d3caeed1d723a508cc13 (diff)
downloadvolse-hubzilla-e8a0005d29244e4897ca7806f24424a8f63d1dd8.tar.gz
volse-hubzilla-e8a0005d29244e4897ca7806f24424a8f63d1dd8.tar.bz2
volse-hubzilla-e8a0005d29244e4897ca7806f24424a8f63d1dd8.zip
put backticks on mysql reseved words which we unfortunately used for row names a long time ago
-rw-r--r--mod/photos.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/mod/photos.php b/mod/photos.php
index a248feaf5..e122203eb 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -852,7 +852,7 @@ function photos_content(&$a) {
// fetch image, item containing image, then comments
- $ph = q("SELECT aid,uid,xchan,resource_id,created,edited,title,desc,album,filename,type,height,width,size,scale,profile,photo_flags,allow_cid,allow_gid,deny_cid,deny_gid FROM `photo` WHERE `uid` = %d AND `resource_id` = '%s'
+ $ph = q("SELECT aid,uid,xchan,resource_id,created,edited,title,`desc`,album,filename,`type`,height,width,`size`,scale,profile,photo_flags,allow_cid,allow_gid,deny_cid,deny_gid FROM `photo` WHERE `uid` = %d AND `resource_id` = '%s'
and (photo_flags = %d or photo_flags = %d ) $sql_extra ORDER BY `scale` ASC ",
intval($owner_uid),
dbesc($datum),