diff options
| author | Mario Vavti <mario@mariovavti.com> | 2016-06-02 11:02:15 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2016-06-02 11:02:15 +0200 |
| commit | f23bdde464ef20ad2ffcb3984cc9481955374809 (patch) | |
| tree | 5f1d46f3f513ecf2d788b842c0dd01cbd9ac1a99 /Zotlabs/Module/Fbrowser.php | |
| parent | c1039977f1d64611d2c793f3aded96d031b74183 (diff) | |
| parent | 05d9e1bee565ac0448c779a00d8d637341390cf7 (diff) | |
| download | volse-hubzilla-f23bdde464ef20ad2ffcb3984cc9481955374809.tar.gz volse-hubzilla-f23bdde464ef20ad2ffcb3984cc9481955374809.tar.bz2 volse-hubzilla-f23bdde464ef20ad2ffcb3984cc9481955374809.zip | |
Merge branch 'dev' into sabre32
Diffstat (limited to 'Zotlabs/Module/Fbrowser.php')
| -rw-r--r-- | Zotlabs/Module/Fbrowser.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zotlabs/Module/Fbrowser.php b/Zotlabs/Module/Fbrowser.php index eef3cb67d..c534e8f72 100644 --- a/Zotlabs/Module/Fbrowser.php +++ b/Zotlabs/Module/Fbrowser.php @@ -45,10 +45,10 @@ class Fbrowser extends \Zotlabs\Web\Controller { $album = hex2bin(\App::$argv[2]); $sql_extra = sprintf("AND `album` = '%s' ",dbesc($album)); $sql_extra2 = ""; - $path[]=array(z_root()."/fbrowser/image/".\App::$argv[2]."/", $album); + $path[]=array(z_root() . "/fbrowser/image/" . \App::$argv[2] . "/", $album); } - $r = q("SELECT `resource_id`, `id`, `filename`, type, min(`scale`) AS `hiq`,max(`scale`) AS `loq`, `description` + $r = q("SELECT `resource_id`, `id`, `filename`, type, min(`imgscale`) AS `hiq`,max(`imgscale`) AS `loq`, `description` FROM `photo` WHERE `uid` = %d $sql_extra GROUP BY `resource_id` $sql_extra2", intval(local_channel()) |