From 98057dba5b71d0a384f401608d5f57f5220a057e Mon Sep 17 00:00:00 2001 From: Thomas Tanghus <thomas@tanghus.net> Date: Thu, 2 Aug 2012 19:35:38 +0200 Subject: [PATCH] Revert "Removed text/plain header." This reverts commit fa6d26b53c020940e38f632940f73dbbb56f6847. --- apps/contacts/ajax/currentphoto.php | 2 ++ apps/contacts/ajax/savecrop.php | 3 +++ apps/contacts/ajax/uploadphoto.php | 2 ++ 3 files changed, 7 insertions(+) diff --git a/apps/contacts/ajax/currentphoto.php b/apps/contacts/ajax/currentphoto.php index c8cccf83a6..96080e661e 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 e1826b6a3c..f9a32bc3ba 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 63abeb1fee..4cd38db8c7 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. -- GitLab