merged branch jakzal/propel1-modelchoice-preferred-fix (PR #6569)
This PR was merged into the master branch.
Commits
-------
310f691
[Propel1] Fixed preferred choices in the ModelChoiceList.
Discussion
----------
[Propel1] Fixed preferred choices in the ModelChoiceList
Related change was made in #6454 but for some reason part of that change was not merged from 2.1 branch.
Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: some Locale tests fail, fixed in #6568
Fixes the following tickets:
Todo: -
License of the code: MIT
Documentation PR: -
This commit is contained in:
commit
48c839d450
@ -104,7 +104,7 @@ class ModelChoiceList extends ObjectChoiceList
|
||||
$this->identifierAsIndex = true;
|
||||
}
|
||||
|
||||
parent::__construct($choices, $labelPath, array(), $groupPath);
|
||||
parent::__construct($choices, $labelPath, $preferred, $groupPath);
|
||||
}
|
||||
|
||||
/**
|
||||
|
Reference in New Issue
Block a user