summaryrefslogtreecommitdiffstats
path: root/apps/contacts/ajax
diff options
context:
space:
mode:
authorThomas Tanghus <thomas@tanghus.net>2012-08-02 19:35:38 +0200
committerThomas Tanghus <thomas@tanghus.net>2012-08-03 21:32:27 +0200
commit98057dba5b71d0a384f401608d5f57f5220a057e (patch)
tree5443c30fc8a8695c3820c2c4dcdbf21b0712b178 /apps/contacts/ajax
parentfc4a542dd097adac39a3aa19bf878bfce3747e31 (diff)
downloadnextcloud-server-98057dba5b71d0a384f401608d5f57f5220a057e.tar.gz
nextcloud-server-98057dba5b71d0a384f401608d5f57f5220a057e.zip
Revert "Removed text/plain header."
This reverts commit fa6d26b53c020940e38f632940f73dbbb56f6847.
Diffstat (limited to 'apps/contacts/ajax')
-rw-r--r--apps/contacts/ajax/currentphoto.php2
-rw-r--r--apps/contacts/ajax/savecrop.php3
-rw-r--r--apps/contacts/ajax/uploadphoto.php2
3 files changed, 7 insertions, 0 deletions
diff --git a/apps/contacts/ajax/currentphoto.php b/apps/contacts/ajax/currentphoto.php
index c8cccf83a65..96080e661ef 100644
--- a/apps/contacts/ajax/currentphoto.php
+++ b/apps/contacts/ajax/currentphoto.php
@@ -20,6 +20,8 @@
*
*/
+// Firefox and Konqueror tries to download application/json for me. --Arthur
+OCP\JSON::setContentTypeHeader('text/plain');
OCP\JSON::checkLoggedIn();
OCP\JSON::checkAppEnabled('contacts');
require_once 'loghandler.php';
diff --git a/apps/contacts/ajax/savecrop.php b/apps/contacts/ajax/savecrop.php
index e1826b6a3c5..f9a32bc3ba4 100644
--- a/apps/contacts/ajax/savecrop.php
+++ b/apps/contacts/ajax/savecrop.php
@@ -24,6 +24,9 @@ OCP\JSON::checkLoggedIn();
OCP\JSON::checkAppEnabled('contacts');
OCP\JSON::callCheck();
+// Firefox and Konqueror tries to download application/json for me. --Arthur
+OCP\JSON::setContentTypeHeader('text/plain');
+
require_once 'loghandler.php';
$image = null;
diff --git a/apps/contacts/ajax/uploadphoto.php b/apps/contacts/ajax/uploadphoto.php
index 63abeb1fee1..4cd38db8c72 100644
--- a/apps/contacts/ajax/uploadphoto.php
+++ b/apps/contacts/ajax/uploadphoto.php
@@ -25,6 +25,8 @@ OCP\JSON::checkLoggedIn();
OCP\JSON::checkAppEnabled('contacts');
OCP\JSON::callCheck();
+// Firefox and Konqueror tries to download application/json for me. --Arthur
+OCP\JSON::setContentTypeHeader('text/plain');
require_once 'loghandler.php';
$l10n = OC_Contacts_App::$l10n;
// If it is a Drag'n'Drop transfer it's handled here.