sorting albums added back

2 files changed, 1 insertions, 88 deletions

diff --git a/actions/edit.php b/actions/edit.php
deleted file mode 100644
index df65448c8..000000000
--- a/actions/edit.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-
-/**
- * Tidypics edit album/image action
- *
- */
-
-// Make sure we're logged in 
-gatekeeper();
-
-// Get input data
-$guid    = (int) get_input('guid');  // guid of image or album
-$title   = get_input('tidypicstitle');
-$body    = get_input('tidypicsbody');
-$access  = get_input('access_id');
-$tags    = get_input('tidypicstags');
-$subtype = get_input('subtype');
-$cover   = get_input('cover');
-if (is_array($cover)) {
-	$cover = $cover[0];
-}
-
-$container_guid = get_input('container_guid');
-
-// Make sure we actually have permission to edit
-$entity = get_entity($guid);
-if (!$entity->canEdit()) {
-	forward();
-}
-
-// Get owning user/group
-$owner = get_entity($entity->getOwner());
-
-// change access only if access is different from current
-if ($subtype == 'album' && $entity->access_id != $access) {
-	$entity->access_id = $access;
-
-	//get images from album and update access on image entities
-	$images = elgg_get_entities(array(
-		"type" => "object",
-		"subtype" => "image",
-		"container_guid" => $guid,
-		"limit" => ELGG_ENTITIES_NO_VALUE,
-	));
-	foreach ($images as $im) {
-		$im->access_id = $access;
-		$im->save();
-	}
-}
-
-
-// Set its title and description appropriately
-$entity->title = $title;
-$entity->description = $body;
-
-// Before we can set metadata, we need to save the entity
-if (!$entity->save()) {
-	register_error(elgg_echo("album:error"));
-	$entity->delete();
-	forward($_SERVER['HTTP_REFERER']); //failed, so forward to previous page
-}
-
-// Now let's add tags
-$tagarray = string_to_tag_array($tags);
-$entity->clearMetadata('tags');
-if (is_array($tagarray)) {
-	$entity->tags = $tagarray;
-}
-
-//if cover meta is sent from image save as metadata
-if ($subtype == 'image' && $cover == elgg_echo('album:cover')) {
-	$album = get_entity($container_guid);
-	$album->setCoverImageGuid($entity->guid);
-}
-
-// Success message
-if ($subtype == 'album') {
-	system_message(elgg_echo("album:edited"));
-	// plugins can register to be told when a Tidypics album has been updated
-	trigger_elgg_event('update', 'tp_album', $entity);
-} else {
-	system_message(elgg_echo('images:edited'));
-	// plugins can register to be told when a Tidypics image has been updated
-	trigger_elgg_event('update', 'tp_image', $entity);
-}
-
-forward($entity->getURL());
diff --git a/actions/sortalbum.php b/actions/photos/album/sort.php
index 1aa0e052f..613747784 100644
--- a/actions/sortalbum.php
+++ b/actions/photos/album/sort.php
@@ -14,5 +14,5 @@ $guids = explode(',', $guids);
 
 $album->setImageList($guids);
 
-system_message(sprintf(elgg_echo('tidypics:album:sorted'), $album->title));
+system_message(elgg_echo('tidypics:album:sorted', array($album->title)));
 forward($album->getURL());
\ No newline at end of file