changing name of edit action since it works for both images and albums

3 files changed, 2 insertions, 2 deletions

diff --git a/actions/editalbum.php b/actions/edit.php
index 78b1f1653..78b1f1653 100644
--- a/actions/editalbum.php
+++ b/actions/edit.php
diff --git a/start.php b/start.php
index 798becce4..f9df12603 100644
--- a/start.php
+++ b/start.php
@@ -196,7 +196,7 @@
 	// Register actions

 	register_action("tidypics/upload", false, $CONFIG->pluginspath . "tidypics/actions/upload.php");

 	register_action("tidypics/addalbum", false, $CONFIG->pluginspath. "tidypics/actions/addalbum.php");

-	register_action("tidypics/editalbum", false, $CONFIG->pluginspath. "tidypics/actions/editalbum.php");

+	register_action("tidypics/edit", false, $CONFIG->pluginspath. "tidypics/actions/edit.php");

 	register_action("tidypics/delete", false, $CONFIG->pluginspath. "tidypics/actions/delete.php");

 	register_action("tidypics/icon", true, $CONFIG->pluginspath. "tidypics/actions/icon.php");

 	register_action("tidypics/edit_multi", false, $CONFIG->pluginspath. "tidypics/actions/edit_multi.php");

diff --git a/views/default/tidypics/forms/edit.php b/views/default/tidypics/forms/edit.php
index 08fe5cc81..d59d029cc 100644
--- a/views/default/tidypics/forms/edit.php
+++ b/views/default/tidypics/forms/edit.php
@@ -10,7 +10,7 @@
 	//set stuff if we are editing existing album or image

 	if (isset($vars['entity'])) {

 		$title = sprintf(elgg_echo("album:edit"),$object->title);

-		$action = "tidypics/editalbum";

+		$action = "tidypics/edit";

 		$title = $vars['entity']->title;

 		$body = $vars['entity']->description;

 		$tags = $vars['entity']->tags;