diff --git a/cake/libs/controller/components/auth.php b/cake/libs/controller/components/auth.php index a2d7c8807..11c91f0d7 100644 --- a/cake/libs/controller/components/auth.php +++ b/cake/libs/controller/components/auth.php @@ -339,9 +339,6 @@ class AuthComponent extends Object { } $type = array('model' => $object); break; - default: - return true; - break; } if ($this->isAuthorized($type)) { @@ -419,7 +416,7 @@ class AuthComponent extends Object { case 'crud': $this->mapActions(); if (!isset($this->actionMap[$this->params['action']])) { - trigger_error(sprintf(__('Auth::startup() - Attempted access of un-mapped action "$1%s" in controller "$2%s"', true), $this->params['action'], $this->params['controller']), E_USER_WARNING); + trigger_error(sprintf(__('Auth::startup() - Attempted access of un-mapped action "%1$s" in controller "%2$s"', true), $this->params['action'], $this->params['controller']), E_USER_WARNING); } else { $valid = $this->Acl->check($user, $this->action(':controller'), $this->actionMap[$this->params['action']]); } diff --git a/cake/libs/controller/controller.php b/cake/libs/controller/controller.php index d4c72b979..65e9ca255 100644 --- a/cake/libs/controller/controller.php +++ b/cake/libs/controller/controller.php @@ -881,7 +881,7 @@ class Controller extends Object { } if (!is_object($object)) { - trigger_error(sprintf(__("Controller::paginate() - can't find model %s in controller %sController", true), $object, $this->name), E_USER_WARNING); + trigger_error(sprintf(__("Controller::paginate() - can't find model %1$s in controller %2$sController", true), $object, $this->name), E_USER_WARNING); return array(); } $options = am($this->params, $this->params['url'], $this->passedArgs);