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

fabpot · fabpot · commit 422ad836fba2 · 2012-12-14T08:05:49.000+01:00
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 :+1:
diff --git a/src/Symfony/Bridge/Propel1/Form/ChoiceList/ModelChoiceList.php b/src/Symfony/Bridge/Propel1/Form/ChoiceList/ModelChoiceList.php
@@ -345,7 +345,7 @@ private function getIdentifierValues($model)
         }
 
         // 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());
         }
 

Original file line number	Diff line number	Diff line change
`@@ -345,7 +345,7 @@ private function getIdentifierValues($model)`
`345`	`345`	`}`
`346`	`346`
`347`	`347`	`// readonly="true" models do not implement Persistent.`
`348`		`- if ($model instanceof BaseObject and method_exists($model, 'getPrimaryKey')) {`
	`348`	`+ if ($model instanceof BaseObject && method_exists($model, 'getPrimaryKey')) {`
`349`	`349`	`return array($model->getPrimaryKey());`
`350`	`350`	`}`
`351`	`351`