3 files changed, 47 insertions, 39 deletions
diff --git a/pages/photos/album/sort.php b/pages/photos/album/sort.php
new file mode 100644
index 000000000..874da4777
--- /dev/null
+++ b/pages/photos/album/sort.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Album sort page
+ *
+ * This displays a listing of all the photos so that they can be sorted
+ */
+
+gatekeeper();
+group_gatekeeper();
+
+// get the album entity
+$album_guid = (int) get_input('guid');
+$album = get_entity($album_guid);
+
+// panic if we can't get it
+if (!$album) {
+	forward();
+}
+
+// container should always be set, but just in case
+$owner = $album->getContainerEntity();
+elgg_set_page_owner_guid($owner->getGUID());
+
+$title = elgg_echo('tidypics:sort', array($album->getTitle()));
+
+// set up breadcrumbs
+elgg_push_breadcrumb(elgg_echo('photos'), 'photos/all');
+if (elgg_instanceof($owner, 'group')) {
+	elgg_push_breadcrumb($owner->name, "photos/group/$owner->guid/all");
+} else {
+	elgg_push_breadcrumb($owner->name, "photos/owner/$owner->username");
+}
+elgg_push_breadcrumb($album->title, $album->getURL());
+elgg_push_breadcrumb($title);
+
+
+$content = elgg_view_form('photos/album/sort', array(), array('album' => $album));
+
+$body = elgg_view_layout('content', array(
+	'filter' => false,
+	'content' => $content,
+	'title' => $title,
+	'sidebar' => elgg_view('tidypics/sidebar', array('page' => 'album')),
+));
+
+echo elgg_view_page($title, $body);
diff --git a/pages/photos/image/view.php b/pages/photos/image/view.php
index d9231eb08..f172b7cd6 100644
--- a/pages/photos/image/view.php
+++ b/pages/photos/image/view.php
@@ -21,7 +21,7 @@ $owner = elgg_get_page_owner_entity();
 
 // set up breadcrumbs
 elgg_push_breadcrumb(elgg_echo('photos'), 'photos/all');
-if (elgg_instanceof($page_owner, 'group')) {
+if (elgg_instanceof($owner, 'group')) {
 	elgg_push_breadcrumb($owner->name, "photos/group/$owner->guid/all");
 } else {
 	elgg_push_breadcrumb($owner->name, "photos/owner/$owner->username");
diff --git a/pages/sortalbum.php b/pages/sortalbum.php
deleted file mode 100644
index 0bbd8159e..000000000
--- a/pages/sortalbum.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
- * Tidypics Album Sort Page
- *
- * This displays a listing of all the photos so that they can be sorted
- */
-
-// if this page belongs to a closed group, prevent anyone outside group from seeing
-if (is_callable('group_gatekeeper')) {
-	group_gatekeeper();
-}
-
-// get the album entity
-$album_guid = (int) get_input('guid');
-$album = get_entity($album_guid);
-
-// panic if we can't get it
-if (!$album) {
-	forward();
-}
-
-// container should always be set, but just in case
-if ($album->container_guid) {
-	set_page_owner($album->container_guid);
-} else {
-	set_page_owner($album->owner_guid);
-}
-
-$owner = page_owner_entity();
-
-$title = sprintf(elgg_echo('tidypics:sort'), $album->title);
-
-$content = elgg_view_title($title);
-$content .= elgg_view('tidypics/sort', array('album' => $album));
-
-$body = elgg_view_layout('two_column_left_sidebar', '', $content);
-
-page_draw($title, $body);