summaryrefslogtreecommitdiff
path: root/modules/organize/controllers
diff options
context:
space:
mode:
authorTim Almdal <tnalmdal@shaw.ca>2010-07-06 14:12:00 -0700
committerTim Almdal <tnalmdal@shaw.ca>2010-07-06 14:12:01 -0700
commitdbf3199e46d8a9c0ae37108f6afda35232ef4cdd (patch)
tree0dfda5cf87fdcd5ded534c9eb6f21bb44e4906f9 /modules/organize/controllers
parent9d66783f47636153bf3661d1d89e694dd5188c36 (diff)
Fix for ticket #1181. Use $.getJSON to retrieve the json contents of the dialog. Convert all the controllers
that create the data to go into a dialog to return the html as part of a json object.
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 135a6fc9..ebd40c8d 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() {