Adding fix for Ticket #2316

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4716 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
phpnut 2007-03-30 12:18:23 +00:00
parent 918c6e7e93
commit 095574ecc8

View file

@ -1765,8 +1765,6 @@ class Model extends Overloadable {
* @return array An associative array of records, where the id is the key, and the display field is the value
*/
function generateList($conditions = null, $order = null, $limit = null, $keyPath = null, $valuePath = null, $groupPath = null) {
$db =& ConnectionManager::getDataSource($this->useDbConfig);
if ($keyPath == null && $valuePath == null && $groupPath == null && $this->hasField($this->displayField)) {
$fields = array($this->primaryKey, $this->displayField);
} else {