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

Merge branch 'master' into 2.5

Browse source 
Conflicts:
	lib/Cake/Model/Datasource/DboSource.php
	lib/Cake/Test/Case/Model/Datasource/Database/MysqlTest.php
	lib/Cake/Utility/Folder.php
	lib/Cake/VERSION.txt
This commit is contained in:
ADmad 2014-05-04 13:28:53 +05:30
commit d466e00644
48 changed files with 138 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/Cake/Routing/Router.php
View file

@ -700,10 +700,10 @@ class Router {
}
/**
* Get the either the current request object, or the first one.
* Gets the current request object, or the first one.
*
* @param boolean $current Whether you want the request from the top of the stack or the first one.
* @return CakeRequest or null.
* @param boolean $current True to get the current request object, or false to get the first one.
* @return CakeRequest|null Null if stack is empty.
*/
public static function getRequest($current = false) {
if ($current) {