From 425714a281db9de6160975d991e026b1e34398d9 Mon Sep 17 00:00:00 2001
From: Andrew O'Neil <andy@andyofniall.net>
Date: Sun, 2 Dec 2007 21:35:30 +0000
Subject: [PATCH] Authentication for test wasn't working. (merged from
 branches/2.2.0@45907, r45823)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46114 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 security/Security.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/security/Security.php b/security/Security.php
index 48ed4e3f6..250bb5294 100644
--- a/security/Security.php
+++ b/security/Security.php
@@ -491,8 +491,10 @@ class Security extends Controller {
 				&& !empty(self::$default_username) && !empty(self::$default_password)) {
 			$member = self::findAnAdministrator();
 		} else {
-			$member = DataObject::get_one("Member",
-				"Email = '$SQL_email' And Password = '$SQL_password'");
+			$member = DataObject::get_one("Member", 	"Email = '$SQL_email' AND Password IS NOT NULL");
+			if($member && ($member->checkPassword($RAW_password) == false)) {
+				$member = null;
+			}
 		}
 
 		return $member;