From 49ee0cc1bcca583a1fed6e0a4b9c724928c105c8 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Thu, 16 Jul 2009 23:47:12 +0000
Subject: [PATCH] BUGFIX Only set response header in
 XMLDataFormatter->convertDataObject() if a response is defined (merged from
 branches/2.3-nzct)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@82057 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 api/XMLDataFormatter.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/api/XMLDataFormatter.php b/api/XMLDataFormatter.php
index e7329d6d3..f8fdf6c30 100644
--- a/api/XMLDataFormatter.php
+++ b/api/XMLDataFormatter.php
@@ -32,7 +32,11 @@ class XMLDataFormatter extends DataFormatter {
 	 * @return String XML
 	 */
 	public function convertDataObject(DataObjectInterface $obj, $fields = null) {
-		Controller::curr()->getResponse()->addHeader("Content-Type", "text/xml");
+		$response = Controller::curr()->getResponse();
+		if($response) {
+			$response->addHeader("Content-Type", "text/xml");
+		}
+		
 		return "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" . $this->convertDataObjectWithoutHeader($obj, $fields);
 	}