From 56e75b4486e80626245d30b9081b8492f8350d26 Mon Sep 17 00:00:00 2001
From: Sean Harvey <sean@silverstripe.com>
Date: Thu, 10 May 2012 14:11:33 +1200
Subject: [PATCH] MINOR Revert changes for 5.4

---
 model/Database.php                | 4 ++--
 tests/model/MySQLDatabaseTest.php | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/model/Database.php b/model/Database.php
index 78c298751..96c9c424d 100644
--- a/model/Database.php
+++ b/model/Database.php
@@ -230,9 +230,9 @@ abstract class SS_Database {
 	 * Returns true if schema modifications were requested after a beginSchemaUpdate() call.
 	 */
 	function doesSchemaNeedUpdating() {
-		return ($this->schemaUpdateTransaction === null) ? false : true;
+		return (bool)$this->schemaUpdateTransaction;
 	}
-
+	
 	// Transactional schema altering functions - they don't do anyhting except for update schemaUpdateTransaction
 	
 	/**
diff --git a/tests/model/MySQLDatabaseTest.php b/tests/model/MySQLDatabaseTest.php
index 456dc1bfa..1cac2ad14 100644
--- a/tests/model/MySQLDatabaseTest.php
+++ b/tests/model/MySQLDatabaseTest.php
@@ -35,9 +35,10 @@ class MySQLDatabaseTest extends SapphireTest {
 			$db->beginSchemaUpdate();
 			$obj = new MySQLDatabaseTest_DO();
 			$obj->requireTable();
-			$this->assertTrue($db->doesSchemaNeedUpdating());
+			$needsUpdating = $db->doesSchemaNeedUpdating();
 			$db->cancelSchemaUpdate();
-			$this->assertFalse($db->doesSchemaNeedUpdating());
+
+			$this->assertFalse($needsUpdating);
 		}
 	}
 }