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 calls to ContentNegotiator::disable() since it's disabled by default (from r93682)

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@93769 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Sean Harvey 2009-11-27 01:46:16 +00:00
parent 8844c1adf9
commit c640c5c5a9
4 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/RestfulServer.php
View File

@ -132,8 +132,6 @@ class RestfulServer extends Controller {
* Since no $Action url-param is set, all requests are sent here. * Since no $Action url-param is set, all requests are sent here.
*/ */
function index() { function index() {
ContentNegotiator::disable();
if(!isset($this->urlParams['ClassName'])) return $this->notFound(); if(!isset($this->urlParams['ClassName'])) return $this->notFound();
$className = $this->urlParams['ClassName']; $className = $this->urlParams['ClassName'];
$id = (isset($this->urlParams['ID'])) ? $this->urlParams['ID'] : null; $id = (isset($this->urlParams['ID'])) ? $this->urlParams['ID'] : null;

1
api/SapphireSoapServer.php
View File

@ -27,7 +27,6 @@ class SapphireSoapServer extends Controller {
); );
function wsdl() { function wsdl() {
ContentNegotiator::disable();
$this->getResponse()->addHeader("Content-Type", "text/xml"); $this->getResponse()->addHeader("Content-Type", "text/xml");
return array(); return array();

3
core/control/ContentNegotiator.php
View File

@ -6,9 +6,6 @@
* sends along with the HTTP request, which is most likely "application/xhtml+xml" * sends along with the HTTP request, which is most likely "application/xhtml+xml"
* (see "Order of selection" below). * (see "Order of selection" below).
* *
* IMPORTANT: This conversion happens by default to all template output unless
* explicitly disabled through ContentNegotiator::disable().
*
* Order of selection between html or xhtml is as follows: * Order of selection between html or xhtml is as follows:
* - if PHP has already sent the HTTP headers, default to "html" (we can't send HTTP Content-Type headers any longer) * - if PHP has already sent the HTTP headers, default to "html" (we can't send HTTP Content-Type headers any longer)
* - if a GET variable ?forceFormat is set, it takes precedence (for testing purposes) * - if a GET variable ?forceFormat is set, it takes precedence (for testing purposes)

2
tests/api/RestfulServiceTest.php
View File

@ -94,7 +94,6 @@ class RestfulServiceTest extends SapphireTest {
class RestfulServiceTest_Controller extends Controller { class RestfulServiceTest_Controller extends Controller {
public function index() { public function index() {
ContentNegotiator::disable();
BasicAuth::protect_entire_site(false); BasicAuth::protect_entire_site(false);
$request = ''; $request = '';
@ -125,7 +124,6 @@ XML;
} }
public function invalid() { public function invalid() {
ContentNegotiator::disable();
BasicAuth::protect_entire_site(false); BasicAuth::protect_entire_site(false);
$out = <<<XML $out = <<<XML
<?xml version="1.0"?> <?xml version="1.0"?>