From 6ab195854ddee124b24b880ed96bb0db5fdc7805 Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Mon, 29 Dec 2008 22:41:53 +0000 Subject: Remove rest::JSON content type; it's causing lots of problems and it doesn't directly help since text/html works just as well for our JSON communications --- modules/watermark/controllers/admin_watermarks.php | 2 -- 1 file changed, 2 deletions(-) (limited to 'modules/watermark/controllers') diff --git a/modules/watermark/controllers/admin_watermarks.php b/modules/watermark/controllers/admin_watermarks.php index 6c6c72bd..6d552dae 100644 --- a/modules/watermark/controllers/admin_watermarks.php +++ b/modules/watermark/controllers/admin_watermarks.php @@ -61,7 +61,6 @@ class Admin_Watermarks_Controller extends Admin_Controller { } public function delete() { - rest::http_content_type(rest::JSON); $form = watermark::get_delete_form(); if ($form->validate()) { if ($name = module::get_var("watermark", "name")) { @@ -92,7 +91,6 @@ class Admin_Watermarks_Controller extends Admin_Controller { } public function add() { - rest::http_content_type(rest::JSON); $form = watermark::get_add_form(); if ($form->validate()) { $file = $_POST["file"]; -- cgit v1.2.3