summaryrefslogtreecommitdiff
path: root/modules/organize/controllers
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/organize/controllers
parent5eb4b8ff6cae33d83cfef8ea3d41cba4352e65d8 (diff)
parent69dfb51490b62bd639c8e09461fad15f4fb51650 (diff)
Merge branch 'master' of github.com:gallery/gallery3
Diffstat (limited to 'modules/organize/controllers')
-rw-r--r--modules/organize/controllers/organize.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/organize/controllers/organize.php b/modules/organize/controllers/organize.php
index 557b3d67..0e647e09 100644
--- a/modules/organize/controllers/organize.php
+++ b/modules/organize/controllers/organize.php
@@ -47,7 +47,7 @@ class Organize_Controller extends Controller {
$v->controller_uri = url::site("organize") . "/";
$v->swf_uri = url::file("modules/organize/lib/Gallery3WebClient.swf?") .
filemtime(MODPATH . "organize/lib/Gallery3WebClient.swf");
- print $v;
+ print json_encode(array("form" => (string) $v));
}
function add_album_fields() {