From dbd826f79402cc456fdd3a287a0e18ca109fcc9c Mon Sep 17 00:00:00 2001 From: Jelle Henkens Date: Sun, 13 May 2012 10:37:50 +0100 Subject: [PATCH] Removing extra space in the extract() calls --- lib/Cake/Model/Behavior/TreeBehavior.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/Cake/Model/Behavior/TreeBehavior.php b/lib/Cake/Model/Behavior/TreeBehavior.php index cc1c788cc04..2b4102fb60a 100644 --- a/lib/Cake/Model/Behavior/TreeBehavior.php +++ b/lib/Cake/Model/Behavior/TreeBehavior.php @@ -244,7 +244,7 @@ public function beforeSave(Model $Model) { */ public function childCount(Model $Model, $id = null, $direct = false) { if (is_array($id)) { - extract (array_merge(array('id' => null), $id)); + extract(array_merge(array('id' => null), $id)); } if ($id === null && $Model->id) { $id = $Model->id; @@ -290,7 +290,7 @@ public function childCount(Model $Model, $id = null, $direct = false) { */ public function children(Model $Model, $id = null, $direct = false, $fields = null, $order = null, $limit = null, $page = 1, $recursive = null) { if (is_array($id)) { - extract (array_merge(array('id' => null), $id)); + extract(array_merge(array('id' => null), $id)); } $overrideRecursive = $recursive; @@ -403,7 +403,7 @@ public function generateTreeList(Model $Model, $conditions = null, $keyPath = nu */ public function getParentNode(Model $Model, $id = null, $fields = null, $recursive = null) { if (is_array($id)) { - extract (array_merge(array('id' => null), $id)); + extract(array_merge(array('id' => null), $id)); } $overrideRecursive = $recursive; if (empty ($id)) { @@ -436,7 +436,7 @@ public function getParentNode(Model $Model, $id = null, $fields = null, $recursi */ public function getPath(Model $Model, $id = null, $fields = null, $recursive = null) { if (is_array($id)) { - extract (array_merge(array('id' => null), $id)); + extract(array_merge(array('id' => null), $id)); } $overrideRecursive = $recursive; if (empty ($id)) { @@ -473,7 +473,7 @@ public function getPath(Model $Model, $id = null, $fields = null, $recursive = n */ public function moveDown(Model $Model, $id = null, $number = 1) { if (is_array($id)) { - extract (array_merge(array('id' => null), $id)); + extract(array_merge(array('id' => null), $id)); } if (!$number) { return false; @@ -531,7 +531,7 @@ public function moveDown(Model $Model, $id = null, $number = 1) { */ public function moveUp(Model $Model, $id = null, $number = 1) { if (is_array($id)) { - extract (array_merge(array('id' => null), $id)); + extract(array_merge(array('id' => null), $id)); } if (!$number) { return false; @@ -595,7 +595,7 @@ public function moveUp(Model $Model, $id = null, $number = 1) { */ public function recover(Model $Model, $mode = 'parent', $missingParentAction = null) { if (is_array($mode)) { - extract (array_merge(array('mode' => 'parent'), $mode)); + extract(array_merge(array('mode' => 'parent'), $mode)); } extract($this->settings[$Model->alias]); $Model->recursive = $recursive; @@ -713,7 +713,7 @@ public function reorder(Model $Model, $options = array()) { */ public function removeFromTree(Model $Model, $id = null, $delete = false) { if (is_array($id)) { - extract (array_merge(array('id' => null), $id)); + extract(array_merge(array('id' => null), $id)); } extract($this->settings[$Model->alias]);