From 5b5cd8776c605b534a56ac0b65d5e9d2f0c6f9e7 Mon Sep 17 00:00:00 2001 From: Will Rossiter Date: Thu, 26 Nov 2009 22:12:40 +0000 Subject: [PATCH] API CHANGE Removed deprecated static function ContentNegotiator::disable() (via r93640) git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@93663 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- core/control/ContentNegotiator.php | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/core/control/ContentNegotiator.php b/core/control/ContentNegotiator.php index d5d153409..8d09a8b1b 100755 --- a/core/control/ContentNegotiator.php +++ b/core/control/ContentNegotiator.php @@ -33,8 +33,11 @@ * but still find it useful to have self-closing tags removed. */ class ContentNegotiator { + protected static $encoding = 'utf-8'; - + + protected static $enabled = false; + /** * Set the character set encoding for this page. By default it's utf-8, but you could change it to, say, windows-1252, to * improve interoperability with extended characters being imported from windows excel. @@ -157,8 +160,6 @@ class ContentNegotiator { $response->setBody($content); } - protected static $enabled = false; - /** * Enable content negotiation for all templates, not just those with the xml header. */ @@ -166,10 +167,6 @@ class ContentNegotiator { self::$enabled = true; } - static function disable() { - self::$enabled = false; - } - /** * Returns true if negotation is enabled for the given response. * By default, negotiation is only enabled for pages that have the xml header. @@ -185,4 +182,5 @@ class ContentNegotiator { } } + ?> \ No newline at end of file