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.

1 files changed, 3 insertions, 3 deletions

diff --git a/modules/watermark/controllers/admin_watermarks.php b/modules/watermark/controllers/admin_watermarks.php
index 18b463ca..8b217b4a 100644
--- a/modules/watermark/controllers/admin_watermarks.php
+++ b/modules/watermark/controllers/admin_watermarks.php
@@ -35,7 +35,7 @@ class Admin_Watermarks_Controller extends Admin_Controller {
   }
 
   public function form_edit() {
-    print watermark::get_edit_form();
+    print json_encode(array("form" => (string) watermark::get_edit_form()));
   }
 
   public function edit() {
@@ -58,7 +58,7 @@ class Admin_Watermarks_Controller extends Admin_Controller {
   }
 
   public function form_delete() {
-    print watermark::get_delete_form();
+    print json_encode(array("form" => (string) watermark::get_delete_form()));
   }
 
   public function delete() {
@@ -88,7 +88,7 @@ class Admin_Watermarks_Controller extends Admin_Controller {
   }
 
   public function form_add() {
-    print watermark::get_add_form();
+    print json_encode(array("form" => (string) watermark::get_add_form()));
   }
 
   public function add() {