summaryrefslogtreecommitdiff
path: root/modules/tag/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/tag/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/tag/controllers')
-rw-r--r--modules/tag/controllers/admin_tags.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/tag/controllers/admin_tags.php b/modules/tag/controllers/admin_tags.php
index 9e875d14..c2da7bc3 100644
--- a/modules/tag/controllers/admin_tags.php
+++ b/modules/tag/controllers/admin_tags.php
@@ -37,7 +37,7 @@ class Admin_Tags_Controller extends Admin_Controller {
public function form_delete($id) {
$tag = ORM::factory("tag", $id);
if ($tag->loaded()) {
- print tag::get_delete_form($tag);
+ print json_encode(array("form" => (string) tag::get_delete_form($tag)));
}
}