Permalink
Browse files

MINOR Resetting Security::$database_is_ready state during tests (regr…

…ession from a9509a6)
  • Loading branch information...
1 parent ca24120 commit a3d99b082dc34a9affa0fb2945311c51f32b01d0 @chillu chillu committed Apr 11, 2012
Showing with 3 additions and 2 deletions.
  1. +2 −1 dev/SapphireTest.php
  2. +1 −1 security/Security.php
@@ -159,6 +159,7 @@ function setUp() {
if(class_exists('SiteTree')) SiteTree::reset();
Hierarchy::reset();
if(Controller::has_curr()) Controller::curr()->setSession(new Session(array()));
+ Security::$database_is_ready = null;
$this->originalTheme = SSViewer::current_theme();
@@ -770,7 +771,7 @@ static function empty_temp_db() {
static function create_temp_db() {
// Disable PHPUnit error handling
restore_error_handler();
-
+
// Create a temporary database, and force the connection to use UTC for time
global $databaseConfig;
$databaseConfig['timezone'] = '+0:00';
@@ -110,7 +110,7 @@ static function get_word_list() {
*
* @var bool
*/
- protected static $database_is_ready = false;
+ static $database_is_ready = false;
/**
* Set location of word list file

0 comments on commit a3d99b0

Please sign in to comment.