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

Merge pull request #878 from chillu/pulls/alternative-db-session

Browse Source 
BUG Using Session::set() for DB::set_alternative_database_name()
This commit is contained in:
Will Rossiter 2012-10-15 22:34:05 -07:00
commit 9eb4af37bf
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
model/DB.php
View File

@ -65,14 +65,14 @@ class DB {
* Set it to null to revert to the main database.
*/
public static function set_alternative_database_name($dbname) {
$_SESSION["alternativeDatabaseName"] = $dbname;
Session::set("alternativeDatabaseName", $dbname);
}
/**
* Get the name of the database in use
*/
public static function get_alternative_database_name() {
return $_SESSION["alternativeDatabaseName"];
return Session::get("alternativeDatabaseName");
}
/**
@ -84,8 +84,8 @@ class DB {
*/
public static function connect($databaseConfig) {
// This is used by TestRunner::startsession() to test up a test session using an alt
if(isset($_SESSION) && !empty($_SESSION['alternativeDatabaseName'])) {
$databaseConfig['database'] = $_SESSION['alternativeDatabaseName'];
if($name = Session::get('alternativeDatabaseName')) {
$databaseConfig['database'] = $name;
}
if(!isset($databaseConfig['type']) || empty($databaseConfig['type'])) {