mirror of
https://github.com/kamilwylegala/cakephp2-php8.git
synced 2024-11-15 03:18:26 +00:00
Merge pull request #3027 from ADmad/2.5-requesthandler-ext
Remove setting of Controller::$ext by RequestHandler.
This commit is contained in:
commit
9534d0d1e7
2 changed files with 0 additions and 14 deletions
|
@ -609,7 +609,6 @@ class RequestHandlerComponent extends Component {
|
||||||
$controller->layout = $this->ajaxLayout;
|
$controller->layout = $this->ajaxLayout;
|
||||||
return $this->respondAs('html', $options);
|
return $this->respondAs('html', $options);
|
||||||
}
|
}
|
||||||
$controller->ext = '.ctp';
|
|
||||||
|
|
||||||
$pluginDot = null;
|
$pluginDot = null;
|
||||||
$viewClassMap = $this->viewClassMap();
|
$viewClassMap = $this->viewClassMap();
|
||||||
|
|
|
@ -352,19 +352,6 @@ class RequestHandlerComponentTest extends CakeTestCase {
|
||||||
$this->assertEquals(true, $this->Controller->params['isAjax']);
|
$this->assertEquals(true, $this->Controller->params['isAjax']);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* 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
|
* testAutoAjaxLayout method
|
||||||
*
|
*
|
||||||
|
|
Loading…
Reference in a new issue