tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #301 from stojg/database-is-ready-checks

Browse Source 
MINOR Security::database_is_ready() check are doing duplicate DB queries...
This commit is contained in:
Ingo Schommer 2012-04-11 06:38:22 -07:00
commit aed5e93da2
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
security/Security.php
View File

@ -104,6 +104,14 @@ class Security extends Controller {
*/
static $force_database_is_ready = null;
/**
* When the database has once been verified as ready, it will not do the
* checks again.
*
* @var bool
*/
protected static $database_is_ready = false;
/**
* Set location of word list file
*
@ -801,6 +809,8 @@ class Security extends Controller {
// Used for unit tests
if(self::$force_database_is_ready !== NULL) return self::$force_database_is_ready;
if(self::$database_is_ready) return self::$database_is_ready;
$requiredTables = ClassInfo::dataClassesFor('Member');
$requiredTables[] = 'Group';
$requiredTables[] = 'Permission';
@ -822,6 +832,7 @@ class Security extends Controller {
if($missingFields) return false;
}
self::$database_is_ready = true;
return true;
}