diff options
| author | zotlabs <mike@macgirvin.com> | 2017-07-18 19:16:47 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-07-18 19:16:47 -0700 |
| commit | b52a968c7461c9873d20d40887f470ab255f16f2 (patch) | |
| tree | ecaac0ae6c74e32c07d80db466df3ec813a1d281 /Zotlabs/Module/Photos.php | |
| parent | 82aa87c190e65b16bbf3656cdae7260ff11c780f (diff) | |
| parent | 229f95d55584008740ce50859ca54fd94c6db11f (diff) | |
| download | volse-hubzilla-b52a968c7461c9873d20d40887f470ab255f16f2.tar.gz volse-hubzilla-b52a968c7461c9873d20d40887f470ab255f16f2.tar.bz2 volse-hubzilla-b52a968c7461c9873d20d40887f470ab255f16f2.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'Zotlabs/Module/Photos.php')
| -rw-r--r-- | Zotlabs/Module/Photos.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zotlabs/Module/Photos.php b/Zotlabs/Module/Photos.php index d993c481e..18d7abc48 100644 --- a/Zotlabs/Module/Photos.php +++ b/Zotlabs/Module/Photos.php @@ -689,7 +689,7 @@ class Photos extends \Zotlabs\Web\Controller { (SELECT resource_id, max(imgscale) imgscale FROM photo left join attach on folder = '%s' and photo.resource_id = attach.hash WHERE attach.uid = %d AND imgscale <= 4 AND photo_usage IN ( %d, %d ) and is_nsfw = %d $sql_extra GROUP BY resource_id) ph ON (p.resource_id = ph.resource_id AND p.imgscale = ph.imgscale) ORDER BY created $order LIMIT %d OFFSET %d", - dbesc($datum), + dbesc($x['hash']), intval($owner_uid), intval(PHOTO_NORMAL), intval(PHOTO_PROFILE), |