merged branch igorw/patch-3 (PR #6341)
This PR was merged into the 2.1 branch.
Commits
-------
a5530c5
[Propel1Bridge] Fix "and => &&" CS in ModelChoiceList
Discussion
----------
[Propel1Bridge] Fix "and => &&" CS in ModelChoiceList
---------------------------------------------------------------------------
by willdurand at 2012-12-13T22:52:45Z
👍
This commit is contained in:
commit
422ad836fb
@ -345,7 +345,7 @@ class ModelChoiceList extends ObjectChoiceList
|
|||||||
}
|
}
|
||||||
|
|
||||||
// readonly="true" models do not implement Persistent.
|
// readonly="true" models do not implement Persistent.
|
||||||
if ($model instanceof BaseObject and method_exists($model, 'getPrimaryKey')) {
|
if ($model instanceof BaseObject && method_exists($model, 'getPrimaryKey')) {
|
||||||
return array($model->getPrimaryKey());
|
return array($model->getPrimaryKey());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user