Skip to content
This repository
Browse code

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

…ession from a9509a6)
  • Loading branch information...
commit a3d99b082dc34a9affa0fb2945311c51f32b01d0 1 parent ca24120
Ingo Schommer authored
3  dev/SapphireTest.php
@@ -159,6 +159,7 @@ function setUp() {
159 159
 		if(class_exists('SiteTree')) SiteTree::reset();
160 160
 		Hierarchy::reset();
161 161
 		if(Controller::has_curr()) Controller::curr()->setSession(new Session(array()));
  162
+		Security::$database_is_ready = null;
162 163
 		
163 164
 		$this->originalTheme = SSViewer::current_theme();
164 165
 		
@@ -770,7 +771,7 @@ static function empty_temp_db() {
770 771
 	static function create_temp_db() {
771 772
 		// Disable PHPUnit error handling
772 773
 		restore_error_handler();
773  
-		
  774
+
774 775
 		// Create a temporary database, and force the connection to use UTC for time
775 776
 		global $databaseConfig;
776 777
 		$databaseConfig['timezone'] = '+0:00';
2  security/Security.php
@@ -110,7 +110,7 @@ static function get_word_list() {
110 110
 	 *
111 111
 	 * @var bool
112 112
 	 */
113  
-	protected static $database_is_ready = false;
  113
+	static $database_is_ready = false;
114 114
 
115 115
 	/**
116 116
 	 * Set location of word list file

0 notes on commit a3d99b0

Please sign in to comment.
Something went wrong with that request. Please try again.