From deaa1d675e261d5841322cb365708a84a73c96a9 Mon Sep 17 00:00:00 2001
From: Geoff Munn <geoff@silverstripe.com>
Date: Mon, 29 Mar 2010 02:45:19 +0000
Subject: [PATCH] BUGFIX: disable function re-enabled

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@101792 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 core/control/ContentNegotiator.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/core/control/ContentNegotiator.php b/core/control/ContentNegotiator.php
index 2675ba3f9..d5865de62 100755
--- a/core/control/ContentNegotiator.php
+++ b/core/control/ContentNegotiator.php
@@ -57,6 +57,13 @@ class ContentNegotiator {
 	static function enable() {
 		self::$enabled = true;
 	}
+	
+	/*
+	 * Disable content negotiation for all templates, not just those with the xml header.
+	 */
+	static function disable() {
+		self::$enabled = false;
+	}
 
 	/**
 	 * Returns true if negotation is enabled for the given response.