From c1da32e6a7e2f4a15a3b2d69cd38a1c0c164a99d Mon Sep 17 00:00:00 2001
From: Brett Profitt <brett.profitt@gmail.com>
Date: Fri, 8 Jun 2012 15:23:47 -0700
Subject: Fixed invalid SQL caused by sorting an empty album.

Also hiding slideshow and sort links for albums with no images.
---
 actions/photos/album/sort.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'actions')

diff --git a/actions/photos/album/sort.php b/actions/photos/album/sort.php
index 453f51ac5..fd62a7ba7 100644
--- a/actions/photos/album/sort.php
+++ b/actions/photos/album/sort.php
@@ -12,7 +12,10 @@ if (!$album) {
 $guids = get_input('guids');
 $guids = explode(',', $guids);
 
-$album->setImageList($guids);
+if ($album->setImageList($guids)) {
+	system_message(elgg_echo('tidypics:album:sorted', array($album->getTitle())));
+} else {
+	register_error(elgg_echo('tidypics:album:could_not_sort', array($album->getTitle())));
+}
 
-system_message(elgg_echo('tidypics:album:sorted', array($album->getTitle())));
 forward($album->getURL());
\ No newline at end of file
-- 
cgit v1.2.3