diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2010-07-13 12:30:03 -0700 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2010-07-13 12:30:03 -0700 |
| commit | 887154a3b797eade36c1c651e2e849c613459544 (patch) | |
| tree | 835214c5c76dbfa2b1de584a6f3f58235a0009ad /modules/gallery/controllers/albums.php | |
| parent | 5eb4b8ff6cae33d83cfef8ea3d41cba4352e65d8 (diff) | |
| parent | 69dfb51490b62bd639c8e09461fad15f4fb51650 (diff) | |
Merge branch 'master' of github.com:gallery/gallery3
Diffstat (limited to 'modules/gallery/controllers/albums.php')
| -rw-r--r-- | modules/gallery/controllers/albums.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/gallery/controllers/albums.php b/modules/gallery/controllers/albums.php index eaa09be5..8aed1341 100644 --- a/modules/gallery/controllers/albums.php +++ b/modules/gallery/controllers/albums.php @@ -168,7 +168,7 @@ class Albums_Controller extends Items_Controller { access::required("view", $album); access::required("add", $album); - print album::get_add_form($album); + print json_encode(array("form" => (string) album::get_add_form($album))); } public function form_edit($album_id) { @@ -176,6 +176,6 @@ class Albums_Controller extends Items_Controller { access::required("view", $album); access::required("edit", $album); - print album::get_edit_form($album); + print json_encode(array("form" => (string) album::get_edit_form($album))); } } |