From 1d9f922216a7cb24a088d919daf2ad59d3206c55 Mon Sep 17 00:00:00 2001 From: Jose Gonzalez Date: Wed, 26 Aug 2009 01:47:03 -0400 Subject: [PATCH] fixing parameters for commentable behavior --- models/behaviors/commentable.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/models/behaviors/commentable.php b/models/behaviors/commentable.php index 883999e..e12c12b 100644 --- a/models/behaviors/commentable.php +++ b/models/behaviors/commentable.php @@ -89,20 +89,20 @@ function createComment(&$model, $commentData = array()){ } function getComments(&$model, $parameters = array()){ - $parameters = array_merge(array('id', 'options'), $parameters); - - if (isset($parameters['id']) && !is_numeric($parameters['id'])) { + $parameters = array_merge(array('id' => $model->id, 'options' => array()), $parameters); + $options = array(); + if (isset($parameters['id']) && is_numeric($parameters['id'])) { $options = array_merge_recursive( - array('conditions' => array("$this->__settings[$model->alias]['class'].$this->__settings[$model->alias]['foreign_key']" => $parameters['id'])), + array('conditions' => array("{$this->__settings[$model->alias]['class']}.{$this->__settings[$model->alias]['foreign_key']}" => $parameters['id'])), $parameters['options'] ); } if (isset($options) && !$this->__checkForEmptyVal($options)){ - $model->Comment->find('all', + return $model->Comment->find('all', $options ); } else { - $model->Comment->find('all'); + return $model->Comment->find('all'); } }