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

BUG fix db bootstrapping issues

Browse Source
This commit is contained in:
Damian Mooyman 2017-06-22 15:14:51 +12:00
parent 7ed4660e7a
commit 188ce35d82
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/ORM/DatabaseAdmin.php
View File

@ -2,6 +2,7 @@
namespace SilverStripe\ORM;
use BadMethodCallException;
use SilverStripe\Control\Controller;
use SilverStripe\Control\Director;
use SilverStripe\Core\ClassInfo;
@ -221,17 +222,16 @@ class DatabaseAdmin extends Controller
}
// Load parameters from existing configuration
global $databaseConfig;
$databaseConfig = DB::getConfig();
if (empty($databaseConfig) && empty($_REQUEST['db'])) {
user_error("No database configuration available", E_USER_ERROR);
throw new BadMethodCallException("No database configuration available");
}
$parameters = (!empty($databaseConfig)) ? $databaseConfig : $_REQUEST['db'];
// Check database name is given
if (empty($parameters['database'])) {
user_error(
"No database name given; please give a value for \$databaseConfig['database']",
E_USER_ERROR
throw new BadMethodCallException(
"No database name given; please give a value for SS_DATABASE_NAME or set SS_DATABASE_CHOOSE_NAME"
);
}
$database = $parameters['database'];

4
src/Security/AuthenticationRequestFilter.php
View File

@ -45,6 +45,10 @@ class AuthenticationRequestFilter implements RequestFilter
*/
public function preRequest(HTTPRequest $request)
{
if (!Security::database_is_ready()) {
return;
}
try {
$this
->getAuthenticationHandler()