diff options
| author | Chad Kieffer <ckieffer@gmail.com> | 2009-07-30 17:28:05 -0600 |
|---|---|---|
| committer | Chad Kieffer <ckieffer@gmail.com> | 2009-07-30 17:28:05 -0600 |
| commit | 9d70f142199f4f3c3ec63fcbb125f5c33c91d9ec (patch) | |
| tree | 189532a66c8996c6f69003ba01e455ce1b050a4e /modules/gallery/controllers/photos.php | |
| parent | ca4f03b93e1c5eb90d1677684fd5220c000d7d34 (diff) | |
| parent | 19d89f94f9939bbd879d6c8ead4e802f592ec808 (diff) | |
Merge branch 'master' of git@github.com:gallery/gallery3
Diffstat (limited to 'modules/gallery/controllers/photos.php')
| -rw-r--r-- | modules/gallery/controllers/photos.php | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/modules/gallery/controllers/photos.php b/modules/gallery/controllers/photos.php index 9d9b25a1..8ee24da8 100644 --- a/modules/gallery/controllers/photos.php +++ b/modules/gallery/controllers/photos.php @@ -61,8 +61,7 @@ class Photos_Controller extends Items_Controller { access::required("view", $photo); access::required("edit", $photo); - $view = photo::get_edit_form($photo); - $form = $view->form; + $form = photo::get_edit_form($photo); if ($valid = $form->validate()) { if ($form->edit_item->filename->value != $photo->name) { // Make sure that there's not a conflict @@ -95,7 +94,7 @@ class Photos_Controller extends Items_Controller { } else { print json_encode( array("result" => "error", - "form" => $view->__toString())); + "form" => $form->__toString())); } } |