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

1 files changed, 0 insertions, 2 deletions

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"];