From 70062ebc9cef301f2742ee08d2fade1bb7a41866 Mon Sep 17 00:00:00 2001 From: Mike Cochrane Date: Wed, 9 Mar 2016 17:40:43 +1300 Subject: [PATCH] FIX 'Settings' fields being overwritten by 'Content' fields CMSMain::getEditForm wasn't passing the $fields parameter to the parent. The the "Settings" fields we being replaced with the "Content" settings when requesting /admin/pages/settings/show/123345 --- code/controllers/CMSMain.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/controllers/CMSMain.php b/code/controllers/CMSMain.php index f4717139..c04d2200 100644 --- a/code/controllers/CMSMain.php +++ b/code/controllers/CMSMain.php @@ -592,7 +592,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);