tonyair
/
silverstripe-subsites
mirror of https://github.com/silverstripe/silverstripe-subsites
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #389 from creative-commoners/pulls/2.1/dont-catch-exceptions 

FIX Only continue delegation when DB exceptions are caused by no database selected
This commit is contained in:
Dylan Wagstaff 2018-09-08 18:54:51 +12:00 committed by GitHub
parent 70dc70f494 313d22ffca
commit fa3f1fa767
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Middleware/InitStateMiddleware.php
View File

@ -43,8 +43,12 @@ class InitStateMiddleware implements HTTPMiddleware
return $delegate($request);
} catch (DatabaseException $ex) {
// Database is not ready
return $delegate($request);
$message = $ex->getMessage();
if (strpos($message, 'No database selected') !== false) {
// Database is not ready, ignore and continue
return $delegate($request);
}
throw $ex;
} finally {
// Persist to the session if using the CMS
if ($state->getUseSessions()) {