Merge pull request #1418 from mikenz/patch-2

FIX 'Settings' fields being overwritten by 'Content' fields
This commit is contained in:
Damian Mooyman 2016-04-06 13:06:14 +12:00
commit 3ed4c0fd52

View File

@ -568,7 +568,7 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
*/
public function getEditForm($id = null, $fields = null) {
if(!$id) $id = $this->currentPageID();
$form = parent::getEditForm($id);
$form = parent::getEditForm($id, $fields);
// TODO Duplicate record fetching (see parent implementation)
$record = $this->getRecord($id);