Consolidate with conditions sniff.

This commit is contained in:
euromark 2014-12-09 03:17:35 +01:00
parent 11981f80fa
commit e1c128bb99
25 changed files with 41 additions and 83 deletions

View file

@ -227,8 +227,7 @@ class Router {
* @throws RouterException
*/
protected static function _validateRouteClass($routeClass) {
if (
$routeClass !== 'CakeRoute' &&
if ($routeClass !== 'CakeRoute' &&
(!class_exists($routeClass) || !is_subclass_of($routeClass, 'CakeRoute'))
) {
throw new RouterException(__d('cake_dev', 'Route class not found, or route class is not a subclass of CakeRoute'));