summaryrefslogtreecommitdiff
path: root/modules/gallery/controllers/albums.php
diff options
context:
space:
mode:
authorTim Almdal <tnalmdal@shaw.ca>2009-07-28 05:40:28 -0700
committerTim Almdal <tnalmdal@shaw.ca>2009-07-28 05:40:28 -0700
commit2e8f73d4e96e4e114493f703a5c2c0207fad5cf5 (patch)
tree8592f39f104bc40a6778d30cfd900a912fd3e8f8 /modules/gallery/controllers/albums.php
parent69f9aea5db38c020a350c5505c2694f3e79f77b5 (diff)
Revert commit 078c77a62b623322956457bfd7bfbdaf56203b00 and change the
tag_event:item_edit_form to use the new Form_Script library to inject script into a form.
Diffstat (limited to 'modules/gallery/controllers/albums.php')
-rw-r--r--modules/gallery/controllers/albums.php5
1 files changed, 2 insertions, 3 deletions
diff --git a/modules/gallery/controllers/albums.php b/modules/gallery/controllers/albums.php
index 4fefd3a1..56b74cb1 100644
--- a/modules/gallery/controllers/albums.php
+++ b/modules/gallery/controllers/albums.php
@@ -166,8 +166,7 @@ class Albums_Controller extends Items_Controller {
access::required("view", $album);
access::required("edit", $album);
- $view = album::get_edit_form($album);
- $form = $view->form;
+ $form = album::get_edit_form($album);
if ($valid = $form->validate()) {
// Make sure that there's not a conflict
if ($album->id != 1 &&
@@ -203,7 +202,7 @@ class Albums_Controller extends Items_Controller {
} else {
print json_encode(
array("result" => "error",
- "form" => $view->__toString()));
+ "form" => $form->__toString()));
}
}