aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2015-06-16 12:54:29 +0200
committerMario Vavti <mario@mariovavti.com>2015-06-16 12:54:29 +0200
commit40ee0d41dc977584a78307f151773137c7f0744d (patch)
tree90933f5fe50e10cc4431792f78f807ac4e542463
parent93f48cd8bb93bb3f8d2ef0ce90b3d1b75fc97859 (diff)
downloadvolse-hubzilla-40ee0d41dc977584a78307f151773137c7f0744d.tar.gz
volse-hubzilla-40ee0d41dc977584a78307f151773137c7f0744d.tar.bz2
volse-hubzilla-40ee0d41dc977584a78307f151773137c7f0744d.zip
fix deleting of album for remote channel
-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)
);