Browse Source

Merge pull request #3027 from ADmad/2.5-requesthandler-ext

Remove setting of Controller::$ext by RequestHandler.
Mark Story 12 years ago
parent
commit
9534d0d1e7

+ 0 - 1
lib/Cake/Controller/Component/RequestHandlerComponent.php

@@ -609,7 +609,6 @@ class RequestHandlerComponent extends Component {
 			$controller->layout = $this->ajaxLayout;
 			return $this->respondAs('html', $options);
 		}
-		$controller->ext = '.ctp';
 
 		$pluginDot = null;
 		$viewClassMap = $this->viewClassMap();

+ 0 - 13
lib/Cake/Test/Case/Controller/Component/RequestHandlerComponentTest.php

@@ -353,19 +353,6 @@ class RequestHandlerComponentTest extends CakeTestCase {
 	}
 
 /**
- * testAutoResponseType method
- *
- * @return void
- */
-	public function testAutoResponseType() {
-		$this->Controller->ext = '.thtml';
-		$this->Controller->request->params['ext'] = 'rss';
-		$this->RequestHandler->initialize($this->Controller);
-		$this->RequestHandler->startup($this->Controller);
-		$this->assertEquals('.ctp', $this->Controller->ext);
-	}
-
-/**
  * testAutoAjaxLayout method
  *
  * @return void