summaryrefslogtreecommitdiff
path: root/modules/tag
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/tag
parent5eb4b8ff6cae33d83cfef8ea3d41cba4352e65d8 (diff)
parent69dfb51490b62bd639c8e09461fad15f4fb51650 (diff)
Merge branch 'master' of github.com:gallery/gallery3
Diffstat (limited to 'modules/tag')
-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)));
}
}