From c9b9275fdf5c63f53df305711664bb666812c26b Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Fri, 5 Dec 2008 04:51:30 +0000 Subject: [PATCH] BUGFIX Only setting LockedOutUntil to NULL in Member->logIn() if the column is actually present in the database. Otherwise this setting will case an UPDATE Member SQL query to fail on the first /dev/build call on a 2.2->2.3 upgrade if not in dev-mode (=requiring login) (see #3171) git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@67529 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- security/Member.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/security/Member.php b/security/Member.php index 82d7f115c..d6c2ec051 100644 --- a/security/Member.php +++ b/security/Member.php @@ -197,7 +197,10 @@ class Member extends DataObject { Session::set('Member.FailedLogins', $failedLogins); } - $this->LockedOutUntil = null; + // Don't set column if its not built yet (the login might be precursor to a /dev/build...) + if(array_key_exists('LockedOutUntil', DB::fieldList('Member'))) { + $this->LockedOutUntil = null; + } $this->write();