From d484d90fe572985aaa1dbf3d58cb38487567e65d Mon Sep 17 00:00:00 2001 From: evilbloodydemon Date: Fri, 22 Apr 2011 23:41:46 +0400 Subject: [PATCH] Unused variables in Controller removed --- lib/Cake/Controller/Component/AclComponent.php | 3 --- lib/Cake/Controller/Component/RequestHandlerComponent.php | 1 - lib/Cake/Controller/Controller.php | 2 -- 3 files changed, 6 deletions(-) diff --git a/lib/Cake/Controller/Component/AclComponent.php b/lib/Cake/Controller/Component/AclComponent.php index fde44da62..5d2348e52 100644 --- a/lib/Cake/Controller/Component/AclComponent.php +++ b/lib/Cake/Controller/Component/AclComponent.php @@ -308,9 +308,6 @@ class DbAcl extends Object implements AclInterface { return false; } - $aroNode = $aroPath[0]; - $acoNode = $acoPath[0]; - if ($action != '*' && !in_array('_' . $action, $permKeys)) { trigger_error(__d('cake_dev', "ACO permissions key %s does not exist in DbAcl::check()", $action), E_USER_NOTICE); return false; diff --git a/lib/Cake/Controller/Component/RequestHandlerComponent.php b/lib/Cake/Controller/Component/RequestHandlerComponent.php index 56cf6c448..52843d60b 100644 --- a/lib/Cake/Controller/Component/RequestHandlerComponent.php +++ b/lib/Cake/Controller/Component/RequestHandlerComponent.php @@ -565,7 +565,6 @@ class RequestHandlerComponent extends Component { $defaults = array('index' => null, 'charset' => null, 'attachment' => false); $options = $options + $defaults; - $cType = null; if (strpos($type, '/') === false) { $cType = $this->response->getMimeType($type); if ($cType === false) { diff --git a/lib/Cake/Controller/Controller.php b/lib/Cake/Controller/Controller.php index e6d9977cb..abc734905 100644 --- a/lib/Cake/Controller/Controller.php +++ b/lib/Cake/Controller/Controller.php @@ -732,8 +732,6 @@ class Controller extends Object { * @link http://book.cakephp.org/view/979/set */ public function set($one, $two = null) { - $data = array(); - if (is_array($one)) { if (is_array($two)) { $data = array_combine($one, $two);