summaryrefslogtreecommitdiff
path: root/modules/gallery/controllers/move.php
diff options
context:
space:
mode:
authorBharat Mediratta <bharat@menalto.com>2010-08-01 10:35:15 -0700
committerBharat Mediratta <bharat@menalto.com>2010-08-01 10:35:15 -0700
commit3b187d7fe9acbe46e38ae824b6374dd3bfd0cfb0 (patch)
tree81af4ec2993f740fb632c9f5ea4572bb2d1efa23 /modules/gallery/controllers/move.php
parent563afbe6ddf4b4debea87a0cb0b8758c8826f80c (diff)
parentbf7115cf5a732cea2d498971ec94d2ade3b2fcdd (diff)
Merge branch 'dialog'
Diffstat (limited to 'modules/gallery/controllers/move.php')
-rw-r--r--modules/gallery/controllers/move.php6
1 files changed, 2 insertions, 4 deletions
diff --git a/modules/gallery/controllers/move.php b/modules/gallery/controllers/move.php
index a99ef341..7b2d6165 100644
--- a/modules/gallery/controllers/move.php
+++ b/modules/gallery/controllers/move.php
@@ -26,7 +26,7 @@ class Move_Controller extends Controller {
$view = new View("move_browse.html");
$view->source = $source;
$view->tree = $this->_get_tree_html($source, ORM::factory("item", 1));
- print json_encode(array("form" => (string) $view));
+ print $view;
}
public function save($source_id) {
@@ -41,9 +41,7 @@ class Move_Controller extends Controller {
item::move($source, $target);
- print json_encode(
- array("result" => "success",
- "location" => $target->url()));
+ json::reply(array("result" => "success", "location" => $target->url()));
}
public function show_sub_tree($source_id, $target_id) {