tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-06-28 23:49:26 +02:00
Code Issues Projects Releases Wiki Activity

MINOR Resetting Security::$database_is_ready state during tests (regression from a9509a610d)

Browse Source
This commit is contained in:
Ingo Schommer 2012-04-11 17:22:55 +02:00
parent ca24120a5e
commit a3d99b082d
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dev/SapphireTest.php
View File

@ -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';

2
security/Security.php
View File

@ -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