diff options
| author | friendica <info@friendica.com> | 2013-12-22 18:37:39 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2013-12-22 18:37:39 -0800 |
| commit | 1a42580ad44f768ba8d4eb0669f3b8be03670e04 (patch) | |
| tree | e40948063cea08c8c0ea4ece8efbcc6bef6464d8 /include/photos.php | |
| parent | eff38538eeaa3af0774c77d26c5b00dd79cb9e8c (diff) | |
| download | volse-hubzilla-1a42580ad44f768ba8d4eb0669f3b8be03670e04.tar.gz volse-hubzilla-1a42580ad44f768ba8d4eb0669f3b8be03670e04.tar.bz2 volse-hubzilla-1a42580ad44f768ba8d4eb0669f3b8be03670e04.zip | |
remove a couple of mysql reserved words from being used as table or row names. For this round we're getting 'group' and 'desc'. Warning: potentially destabilising as this touches a lot of code.
Diffstat (limited to 'include/photos.php')
| -rw-r--r-- | include/photos.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/photos.php b/include/photos.php index 3ccb536a8..e41d1059a 100644 --- a/include/photos.php +++ b/include/photos.php @@ -319,7 +319,7 @@ function photos_list_photos($channel,$observer,$album = '') { $ret = array('success' => false); - $r = q("select 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 ( photo_flags = %d or photo_flags = %d ) $sql_extra ", + $r = q("select resource_id, created, edited, title, description, album, filename, type, height, width, size, scale, profile, photo_flags, allow_cid, allow_gid, deny_cid, deny_gid from photo where uid = %d and ( photo_flags = %d or photo_flags = %d ) $sql_extra ", intval($channel_id), intval(PHOTO_NORMAL), intval(PHOTO_PROFILE) |