From 6c1a29e8071c028e4d27942cd5023963677b61d7 Mon Sep 17 00:00:00 2001
From: Stephen McMahon <stephen@symbiote.com.au>
Date: Fri, 5 Oct 2018 11:17:21 +1000
Subject: [PATCH] Fix move loading Cookie data to before the logged user check
 to prevent 'sticky' user data

---
 src/Forms/CommentForm.php | 35 +++++++++++++++++------------------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/src/Forms/CommentForm.php b/src/Forms/CommentForm.php
index edee7de..137e4e7 100644
--- a/src/Forms/CommentForm.php
+++ b/src/Forms/CommentForm.php
@@ -98,6 +98,23 @@ class CommentForm extends Form
 
         parent::__construct($controller, $name, $fields, $actions, $required);
 
+        // load any data from the cookies
+        if ($data = Cookie::get('CommentsForm_UserData')) {
+            $data = Convert::json2array($data);
+
+            $this->loadDataFrom(array(
+                'Name'  => isset($data['Name']) ? $data['Name'] : '',
+                'URL'   => isset($data['URL']) ? $data['URL'] : '',
+                'Email' => isset($data['Email']) ? $data['Email'] : ''
+            ));
+
+            // allow previous value to fill if comment not stored in cookie (i.e. validation error)
+            $prevComment = Cookie::get('CommentsForm_Comment');
+
+            if ($prevComment && $prevComment != '') {
+                $this->loadDataFrom(array('Comment' => $prevComment));
+            }
+        }
 
         // if the record exists load the extra required data
         if ($record = $controller->getOwnerRecord()) {
@@ -131,24 +148,6 @@ class CommentForm extends Form
 
         // Set it so the user gets redirected back down to the form upon form fail
         $this->setRedirectToFormOnValidationError(true);
-
-        // load any data from the cookies
-        if ($data = Cookie::get('CommentsForm_UserData')) {
-            $data = Convert::json2array($data);
-
-            $this->loadDataFrom(array(
-                'Name'  => isset($data['Name']) ? $data['Name'] : '',
-                'URL'   => isset($data['URL']) ? $data['URL'] : '',
-                'Email' => isset($data['Email']) ? $data['Email'] : ''
-            ));
-
-            // allow previous value to fill if comment not stored in cookie (i.e. validation error)
-            $prevComment = Cookie::get('CommentsForm_Comment');
-
-            if ($prevComment && $prevComment != '') {
-                $this->loadDataFrom(array('Comment' => $prevComment));
-            }
-        }
     }
 
     /**