aboutsummaryrefslogtreecommitdiffstats
path: root/include/photos.php
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-06-18 16:36:47 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-06-18 16:36:47 -0700
commit7e595808122c2c98e49ead0bc311e0532215eedc (patch)
tree002774abf71ed24645ccc7f2d540ed7750d27a62 /include/photos.php
parent1a9c059062eae14a96aac40b2fb4e1efb513dccc (diff)
parentec54111e6b0000f87323b2b0a26756da3b41f146 (diff)
downloadvolse-hubzilla-7e595808122c2c98e49ead0bc311e0532215eedc.tar.gz
volse-hubzilla-7e595808122c2c98e49ead0bc311e0532215eedc.tar.bz2
volse-hubzilla-7e595808122c2c98e49ead0bc311e0532215eedc.zip
Merge https://github.com/redmatrix/redmatrix into pending_merge
Diffstat (limited to 'include/photos.php')
-rw-r--r--include/photos.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/photos.php b/include/photos.php
index 1672e310a..ca8c53679 100644
--- a/include/photos.php
+++ b/include/photos.php
@@ -452,13 +452,13 @@ function photos_album_rename($channel_id, $oldname, $newname) {
function photos_album_get_db_idstr($channel_id, $album, $remote_xchan = '') {
if ($remote_xchan) {
- $r = q("SELECT distinct resource_id as from photo where xchan = '%s' and uid = %d and album = '%s' ",
+ $r = q("SELECT distinct resource_id from photo where xchan = '%s' and uid = %d and album = '%s' ",
dbesc($remote_xchan),
intval($channel_id),
dbesc($album)
);
} else {
- $r = q("SELECT distinct resource_id from photo where uid = %d and album = '%s' ",
+ $r = q("SELECT distinct resource_id from photo where uid = %d and album = '%s' ",
intval($channel_id),
dbesc($album)
);