tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00:00
Code Issues Projects Releases Wiki Activity

API CHANGE Removed deprecated static function ContentNegotiator::disable() - it's disabled by default

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@93640 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Sean Harvey 2009-11-26 21:07:42 +00:00 committed by Sam Minnee
parent aa51b70188
commit b26b7e1228
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
core/control/ContentNegotiator.php
View File

@ -33,8 +33,11 @@
* but still find it useful to have self-closing tags removed. * but still find it useful to have self-closing tags removed.
*/ */
class ContentNegotiator { class ContentNegotiator {
protected static $encoding = 'utf-8'; 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 * 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. * improve interoperability with extended characters being imported from windows excel.
@ -157,8 +160,6 @@ class ContentNegotiator {
$response->setBody($content); $response->setBody($content);
} }
protected static $enabled = false;
/** /**
* Enable content negotiation for all templates, not just those with the xml header. * Enable content negotiation for all templates, not just those with the xml header.
*/ */
@ -166,14 +167,6 @@ class ContentNegotiator {
self::$enabled = true; self::$enabled = true;
} }
/**
* @deprecated in 2.3
*/
static function disable() {
self::$enabled = false;
}
/** /**
* Returns true if negotation is enabled for the given response. * Returns true if negotation is enabled for the given response.
* By default, negotiation is only enabled for pages that have the xml header. * By default, negotiation is only enabled for pages that have the xml header.