summaryrefslogtreecommitdiff
path: root/modules/server_add/controllers/server_add.php
diff options
context:
space:
mode:
authorBharat Mediratta <bharat@menalto.com>2010-07-13 12:30:03 -0700
committerBharat Mediratta <bharat@menalto.com>2010-07-13 12:30:03 -0700
commit887154a3b797eade36c1c651e2e849c613459544 (patch)
tree835214c5c76dbfa2b1de584a6f3f58235a0009ad /modules/server_add/controllers/server_add.php
parent5eb4b8ff6cae33d83cfef8ea3d41cba4352e65d8 (diff)
parent69dfb51490b62bd639c8e09461fad15f4fb51650 (diff)
Merge branch 'master' of github.com:gallery/gallery3
Diffstat (limited to 'modules/server_add/controllers/server_add.php')
-rw-r--r--modules/server_add/controllers/server_add.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/server_add/controllers/server_add.php b/modules/server_add/controllers/server_add.php
index 62c01143..e91d9dd9 100644
--- a/modules/server_add/controllers/server_add.php
+++ b/modules/server_add/controllers/server_add.php
@@ -30,7 +30,7 @@ class Server_Add_Controller extends Admin_Controller {
$view->tree = new View("server_add_tree.html");
$view->tree->files = $files;
$view->tree->parents = array();
- print $view;
+ print json_encode(array("form" => (string) $view));
}
public function children() {