mirror of
https://github.com/kamilwylegala/cakephp2-php8.git
synced 2025-02-28 14:56:23 +00:00
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:
parent
918c6e7e93
commit
095574ecc8
1 changed files with 0 additions and 2 deletions
|
@ -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
|
* @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) {
|
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)) {
|
if ($keyPath == null && $valuePath == null && $groupPath == null && $this->hasField($this->displayField)) {
|
||||||
$fields = array($this->primaryKey, $this->displayField);
|
$fields = array($this->primaryKey, $this->displayField);
|
||||||
} else {
|
} else {
|
||||||
|
|
Loading…
Add table
Reference in a new issue