adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-09-10 13:32:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/2.1' into 2.2

Browse source 
Conflicts:
	lib/Cake/Model/Model.php
	lib/Cake/Test/Case/Model/ModelValidationTest.php
This commit is contained in:
Jose Lorenzo Rodriguez 2012-06-06 11:06:06 -04:30
commit 51635c2ca6
9 changed files with 87 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lib/Cake/View/View.php
View file

@ -319,6 +319,11 @@ class View extends Object {
}
$this->_eventManager = $controller->getEventManager();
}
if (empty($this->request) && !($this->request = Router::getRequest(true))) {
$this->request = new CakeRequest(null, false);
$this->request->base = '';
$this->request->here = $this->request->webroot = '/';
}
if (is_object($controller) && isset($controller->response)) {
$this->response = $controller->response;
} else {