Bläddra i källkod

tweak renderJson to return text/plain only for fake xml request and form upload

Thomas 14 år sedan
förälder
incheckning
9aa4fb801b
1 ändrade filer med 2 tillägg och 1 borttagningar
  1. 2 1
      Controller/CRUDController.php

+ 2 - 1
Controller/CRUDController.php

@@ -40,7 +40,8 @@ class CRUDController extends Controller
         // fake content-type so browser does not show the download popup when this
         // response is rendered through an iframe (used by the jquery.form.js plugin)
         //  => don't know yet if it is the best solution
-        if($this->get('request')->get('_xml_http_request')) {
+        if($this->get('request')->get('_xml_http_request')
+           && strpos($this->get('request')->headers->get('Content-Type'), 'multipart/form-data') === 0) {
             $headers['Content-Type'] = 'text/plain';
         } else {
             $headers['Content-Type'] = 'application/json';