tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-06-28 07:29:26 +02:00
Code Issues Projects Releases Wiki Activity

Ensure ClassManifest isn't flushed twice on build

Browse Source
This commit is contained in:
Loz Calver 2017-07-24 09:34:41 +01:00
parent 4a4d4d079f
commit ad2e1cf552
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/ORM/DatabaseAdmin.php
View File

@ -122,8 +122,12 @@ class DatabaseAdmin extends Controller
// The default time limit of 30 seconds is normally not enough
Environment::increaseTimeLimitTo(600);
// Get all our classes
ClassLoader::inst()->getManifest()->regenerate(false);
// If this code is being run outside of a dev/build or without a ?flush query string param,
// the class manifest hasn't been flushed, so do it here
$request = $this->getRequest();
if (!array_key_exists('flush', $request->getVars()) && strpos($request->getURL(), 'dev/build') !== 0) {
ClassLoader::inst()->getManifest()->regenerate(false);
}
$url = $this->getReturnURL();
if ($url) {