Merge branch 'master' into 2.4

Conflicts:
	lib/Cake/Network/CakeResponse.php
	lib/Cake/TestSuite/CakeTestCase.php
This commit is contained in:
mark_story 2013-08-18 23:10:08 -04:00
commit 0f2d59d987
41 changed files with 133 additions and 83 deletions

View file

@ -183,7 +183,7 @@ class Router {
* @throws RouterException
*/
public static function defaultRouteClass($routeClass = null) {
if (is_null($routeClass)) {
if ($routeClass === null) {
return self::$_routeClass;
}