From a3d99b082dc34a9affa0fb2945311c51f32b01d0 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Wed, 11 Apr 2012 17:22:55 +0200 Subject: [PATCH] MINOR Resetting Security::$database_is_ready state during tests (regression from a9509a610de28) --- dev/SapphireTest.php | 3 ++- security/Security.php | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dev/SapphireTest.php b/dev/SapphireTest.php index 823edcc6e..dd8e4a645 100644 --- a/dev/SapphireTest.php +++ b/dev/SapphireTest.php @@ -159,6 +159,7 @@ class SapphireTest extends PHPUnit_Framework_TestCase { 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 @@ class SapphireTest extends PHPUnit_Framework_TestCase { 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'; diff --git a/security/Security.php b/security/Security.php index 20008dfd9..dfa658259 100644 --- a/security/Security.php +++ b/security/Security.php @@ -110,7 +110,7 @@ class Security extends Controller { * * @var bool */ - protected static $database_is_ready = false; + static $database_is_ready = false; /** * Set location of word list file