diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-06-16 18:43:03 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-06-16 18:43:03 -0700 |
| commit | 65661b7ec31d3524401e6b6d840763cb4d636935 (patch) | |
| tree | 87e09f54fc087e46b2b8aae12e803e0e8f234bcd /include | |
| parent | d84b3cfc3c42c2d62813ff78ccfc9b9c34afc92d (diff) | |
| parent | ec54111e6b0000f87323b2b0a26756da3b41f146 (diff) | |
| download | volse-hubzilla-65661b7ec31d3524401e6b6d840763cb4d636935.tar.gz volse-hubzilla-65661b7ec31d3524401e6b6d840763cb4d636935.tar.bz2 volse-hubzilla-65661b7ec31d3524401e6b6d840763cb4d636935.zip | |
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
mod/photos.php
mod/siteinfo.php
Diffstat (limited to 'include')
| -rw-r--r-- | include/photos.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/photos.php b/include/photos.php index dcf2978bb..bc6d1a758 100644 --- a/include/photos.php +++ b/include/photos.php @@ -455,13 +455,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) ); |