adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-09-07 12:02:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/2.0' into 2.0-class-loading

Browse source 
Conflicts:
	cake/libs/view/helpers/js.php
	cake/tests/lib/templates/missing_conenction.php
	cake/tests/lib/templates/missing_connection.php
	lib/Cake/Model/ConnectionManager.php
	lib/Cake/TestSuite/templates/missing_conenction.php
	lib/Cake/View/Helper/FormHelper.php
	lib/Cake/tests/Case/Core/ConfigureTest.php
This commit is contained in:
Jose Lorenzo Rodriguez 2011-04-11 22:48:08 -04:30
commit 000e05b468
40 changed files with 342 additions and 110 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/Cake/Controller/Component/AuthComponent.php
View file

@ -331,7 +331,7 @@ class AuthComponent extends Component {
}
}
}
if (empty($this->authorize) || $this->isAuthorized()) {
if (empty($this->authorize) || $this->isAuthorized($this->user())) {
return true;
}
@ -707,4 +707,4 @@ class AuthComponent extends Component {
public function flash($message) {
$this->Session->setFlash($message, $this->flash['element'], $this->flash['params'], $this->flash['key']);
}
}
}