diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-10-16 04:22:09 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-10-16 04:22:09 -0700 |
| commit | 52f2509280af0826271e163b8adb980e792b20e3 (patch) | |
| tree | bb8420fa8a9bf5944836a0acb65fe201cf7c4e6e | |
| parent | c07f694a074e034ab78b88c9b9a73776090a929b (diff) | |
| parent | c49198fd71f332666d2660e5d8e7563d50be5e10 (diff) | |
| download | volse-hubzilla-52f2509280af0826271e163b8adb980e792b20e3.tar.gz volse-hubzilla-52f2509280af0826271e163b8adb980e792b20e3.tar.bz2 volse-hubzilla-52f2509280af0826271e163b8adb980e792b20e3.zip | |
Merge https://github.com/redmatrix/hubzilla into pending_merge
| -rw-r--r-- | mod/photos.php | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/mod/photos.php b/mod/photos.php index b4ca19749..0442a5d24 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -316,10 +316,7 @@ function photos_post(&$a) { } } - // @FIXME This query includes data of all thumbnails and could probably - // be made much more memory efficient. - - $p = q("SELECT * FROM `photo` WHERE `resource_id` = '%s' AND `uid` = %d ORDER BY `scale` DESC", + $p = q("SELECT type, is_nsfw, description, resource_id, scale, allow_cid, allow_gid, deny_cid, deny_gid FROM photo WHERE resource_id = '%s' AND uid = %d ORDER BY scale DESC", dbesc($resource_id), intval($page_owner_uid) ); |