From fddf21d983e97b489c26dba95aa35227b15fe9f3 Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Wed, 18 Apr 2012 15:15:52 +0200 Subject: [PATCH] filebrowser: fix style, show 10 recent photos if not in an album --- mod/fbrowser.php | 9 +++++++-- view/filebrowser.tpl | 2 ++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/mod/fbrowser.php b/mod/fbrowser.php index 33695b30f6..66ff9252eb 100644 --- a/mod/fbrowser.php +++ b/mod/fbrowser.php @@ -22,6 +22,9 @@ function fbrowser_content($a){ case "image": $path = array( array($a->get_baseurl()."/fbrowser/image/", t("Photos"))); $albums = false; + $sql_extra = ""; + $sql_extra2 = " ORDER BY created DESC LIMIT 0, 10"; + if ($a->argc==2){ $albums = q("SELECT distinct(`album`) AS `album` FROM `photo` WHERE `uid` = %d ", intval(local_user()) @@ -36,11 +39,13 @@ function fbrowser_content($a){ if ($a->argc==3){ $album = hex2bin($a->argv[2]); $sql_extra = sprintf("AND `album` = '%s' ",dbesc($album)); + $sql_extra2 = ""; $path[]=array($a->get_baseurl()."/fbrowser/image/".$a->argv[2]."/", $album); } - $r = q("SELECT `resource-id`, `id`, `filename`, min(`scale`) AS `hiq`,max(`scale`) AS `loq`, `desc` FROM `photo` WHERE `uid` = %d $sql_extra - AND `scale` <= 4 $sql_extra GROUP BY `resource-id`", + $r = q("SELECT `resource-id`, `id`, `filename`, min(`scale`) AS `hiq`,max(`scale`) AS `loq`, `desc` + FROM `photo` WHERE `uid` = %d $sql_extra + GROUP BY `resource-id` $sql_extra2", intval(local_user()) ); diff --git a/view/filebrowser.tpl b/view/filebrowser.tpl index 45ba3dab9d..1e97237f47 100644 --- a/view/filebrowser.tpl +++ b/view/filebrowser.tpl @@ -3,11 +3,13 @@