From 18661005eedd4175671f4a6f156fa9efe410c9f7 Mon Sep 17 00:00:00 2001
From: Simon Welsh <simon@simon.geek.nz>
Date: Tue, 11 Mar 2014 07:03:20 +1300
Subject: [PATCH] Corrects merge errors.

Closes #2937
---
 forms/Form.php      | 1 +
 security/Member.php | 7 -------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/forms/Form.php b/forms/Form.php
index b5e282953..147219443 100644
--- a/forms/Form.php
+++ b/forms/Form.php
@@ -1105,6 +1105,7 @@ class Form extends RequestHandler {
 
 			return $this->message;
 		}
+	}
 
 	/**
 	 * Set a status message for the form.
diff --git a/security/Member.php b/security/Member.php
index 9fd4ae18e..8210167af 100644
--- a/security/Member.php
+++ b/security/Member.php
@@ -10,8 +10,6 @@
  * @property string Email
  * @property string Password
  * @property string RememberLoginHash
- * @property int NumVisit
- * @property string LastVisited Date and time of last visit
  * @property string AutoLoginHash
  * @property string AutoLoginExpired
  * @property string PasswordEncryption
@@ -1215,11 +1213,6 @@ class Member extends DataObject implements TemplateGlobalProvider {
 			}
 			
 			$mainFields->removeByName('Salt');
-			$mainFields->removeByName('NumVisit');
-
-			$mainFields->makeFieldReadonly('LastVisited');
-
-			$fields->removeByName('Subscriptions');
 
 			// Groups relation will get us into logical conflicts because
 			// Members are displayed within  group edit form in SecurityAdmin