From e26e4d916bc8f0c3da181fddfed7a10fc64616a5 Mon Sep 17 00:00:00 2001
From: Damian Mooyman <damian@silverstripe.com>
Date: Tue, 17 Nov 2015 12:47:07 +1300
Subject: [PATCH] BUG Fix each gridfield having triple gridstate components

---
 code/admin/CommentAdmin.php           | 8 +++-----
 code/extensions/CommentsExtension.php | 8 +++-----
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/code/admin/CommentAdmin.php b/code/admin/CommentAdmin.php
index 36538ed..a7d1329 100644
--- a/code/admin/CommentAdmin.php
+++ b/code/admin/CommentAdmin.php
@@ -46,15 +46,13 @@ class CommentAdmin extends LeftAndMain implements PermissionProvider {
 			return Security::permissionFailure($this);
 		}
 
-		$commentsConfig = CommentsGridFieldConfig::create();
-
 		$newComments = Comment::get()->filter('Moderated', 0);
 
 		$newGrid = new CommentsGridField(
 			'NewComments',
 			_t('CommentsAdmin.NewComments', 'New'),
 			$newComments,
-			$commentsConfig
+			CommentsGridFieldConfig::create()
 		);
 
 		$approvedComments = Comment::get()->filter('Moderated', 1)->filter('IsSpam', 0);
@@ -63,7 +61,7 @@ class CommentAdmin extends LeftAndMain implements PermissionProvider {
 			'ApprovedComments',
 			_t('CommentsAdmin.ApprovedComments', 'Approved'),
 			$approvedComments,
-			$commentsConfig
+			CommentsGridFieldConfig::create()
 		);
 
 		$spamComments = Comment::get()->filter('Moderated', 1)->filter('IsSpam', 1);
@@ -72,7 +70,7 @@ class CommentAdmin extends LeftAndMain implements PermissionProvider {
 			'SpamComments',
 			_t('CommentsAdmin.SpamComments', 'Spam'),
 			$spamComments,
-			$commentsConfig
+			CommentsGridFieldConfig::create()
 		);
 
 		$newCount = '(' . count($newComments) . ')';
diff --git a/code/extensions/CommentsExtension.php b/code/extensions/CommentsExtension.php
index fbfaea6..89636b3 100644
--- a/code/extensions/CommentsExtension.php
+++ b/code/extensions/CommentsExtension.php
@@ -495,15 +495,13 @@ class CommentsExtension extends DataExtension {
 	protected function updateModerationFields(FieldList $fields) {
 		Requirements::css(COMMENTS_DIR . '/css/cms.css');
 
-		$commentsConfig = CommentsGridFieldConfig::create();
-
 		$newComments = $this->owner->AllComments()->filter('Moderated', 0);
 
 		$newGrid = new CommentsGridField(
 			'NewComments',
 			_t('CommentsAdmin.NewComments', 'New'),
 			$newComments,
-			$commentsConfig
+			CommentsGridFieldConfig::create()
 		);
 
 		$approvedComments = $this->owner->AllComments()->filter('Moderated', 1)->filter('IsSpam', 0);
@@ -512,7 +510,7 @@ class CommentsExtension extends DataExtension {
 			'ApprovedComments',
 			_t('CommentsAdmin.Comments', 'Approved'),
 			$approvedComments,
-			$commentsConfig
+			CommentsGridFieldConfig::create()
 		);
 
 		$spamComments = $this->owner->AllComments()->filter('Moderated', 1)->filter('IsSpam', 1);
@@ -521,7 +519,7 @@ class CommentsExtension extends DataExtension {
 			'SpamComments',
 			_t('CommentsAdmin.SpamComments', 'Spam'),
 			$spamComments,
-			$commentsConfig
+			CommentsGridFieldConfig::create()
 		);
 
 		$newCount = '(' . count($newComments) . ')';