diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merged branch igorw/patch-3 (PR #6341)

Browse Source 
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:
Fabien Potencier 2012-12-14 08:05:49 +01:00
commit 422ad836fb
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Bridge/Propel1/Form/ChoiceList/ModelChoiceList.php
View File

@ -345,7 +345,7 @@ class ModelChoiceList extends ObjectChoiceList
}
// 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());
}