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

MINOR: removed disable call. MINOR: moved static functions above instance methods. (via r93659, r93641)

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@93667 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Will Rossiter 2009-11-26 22:16:02 +00:00
parent 5b5cd8776c
commit 66c8dab01a
2 changed files with 24 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
core/control/ContentNegotiator.php
View File

@ -54,6 +54,27 @@ class ContentNegotiator {
return self::$encoding; return self::$encoding;
} }
/**
* Enable content negotiation for all templates, not just those with the xml header.
*/
static function enable() {
self::$enabled = true;
}
/**
* Returns true if negotation is enabled for the given response.
* By default, negotiation is only enabled for pages that have the xml header.
*/
static function enabled_for($response) {
$contentType = $response->getHeader("Content-Type");
// Disable content negotation for other content types
if($contentType && substr($contentType, 0,9) != 'text/html' && substr($contentType, 0,21) != 'application/xhtml+xml') return false;
if(self::$enabled) return true;
else return (substr($response->getBody(),0,5) == '<' . '?xml');
}
static function process(SS_HTTPResponse $response) { static function process(SS_HTTPResponse $response) {
if(!self::enabled_for($response)) return; if(!self::enabled_for($response)) return;
@ -160,27 +181,4 @@ class ContentNegotiator {
$response->setBody($content); $response->setBody($content);
} }
/**
* Enable content negotiation for all templates, not just those with the xml header.
*/
static function enable() {
self::$enabled = true;
} }
/**
* Returns true if negotation is enabled for the given response.
* By default, negotiation is only enabled for pages that have the xml header.
*/
static function enabled_for($response) {
$contentType = $response->getHeader("Content-Type");
// Disable content negotation for other content types
if($contentType && substr($contentType, 0,9) != 'text/html' && substr($contentType, 0,21) != 'application/xhtml+xml') return false;
if(self::$enabled) return true;
else return (substr($response->getBody(),0,5) == '<' . '?xml');
}
}
?>

1
core/control/FormResponse.php
View File

@ -76,7 +76,6 @@ class FormResponse {
if(isset($_REQUEST['forcehtml'])) { if(isset($_REQUEST['forcehtml'])) {
return self::$non_ajax_content; return self::$non_ajax_content;
} else if(isset($_REQUEST['forceajax']) || Director::is_ajax()) { } else if(isset($_REQUEST['forceajax']) || Director::is_ajax()) {
ContentNegotiator::disable();
$response = Controller::curr()->getResponse(); $response = Controller::curr()->getResponse();
$response->addHeader('Content-Type', 'text/javascript'); $response->addHeader('Content-Type', 'text/javascript');
return self::get_javascript(); return self::get_javascript();