mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 14:05:37 +02:00
BUG Fix broken installer assets and session crash
This commit is contained in:
parent
a37672f4df
commit
3633947699
@ -3,7 +3,9 @@
|
|||||||
namespace SilverStripe\Dev\Install;
|
namespace SilverStripe\Dev\Install;
|
||||||
|
|
||||||
use Exception;
|
use Exception;
|
||||||
|
use SilverStripe\Control\Cookie;
|
||||||
use SilverStripe\Control\HTTPRequest;
|
use SilverStripe\Control\HTTPRequest;
|
||||||
|
use SilverStripe\Control\HTTPRequestBuilder;
|
||||||
use SilverStripe\Control\Session;
|
use SilverStripe\Control\Session;
|
||||||
use SilverStripe\Core\CoreKernel;
|
use SilverStripe\Core\CoreKernel;
|
||||||
use SilverStripe\Control\HTTPApplication;
|
use SilverStripe\Control\HTTPApplication;
|
||||||
@ -199,10 +201,8 @@ PHP
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Mock request
|
// Build request
|
||||||
$session = new Session(isset($_SESSION) ? $_SESSION : array());
|
$request = HTTPRequestBuilder::createFromEnvironment();
|
||||||
$request = new HTTPRequest('GET', '/');
|
|
||||||
$request->setSession($session);
|
|
||||||
|
|
||||||
// Install kernel (fix to dev)
|
// Install kernel (fix to dev)
|
||||||
$kernel = new CoreKernel(BASE_PATH);
|
$kernel = new CoreKernel(BASE_PATH);
|
||||||
@ -211,6 +211,9 @@ PHP
|
|||||||
|
|
||||||
// Build db within HTTPApplication
|
// Build db within HTTPApplication
|
||||||
$app->execute($request, function (HTTPRequest $request) use ($config) {
|
$app->execute($request, function (HTTPRequest $request) use ($config) {
|
||||||
|
// Suppress cookie errors on install
|
||||||
|
Cookie::config()->set('report_errors', false);
|
||||||
|
|
||||||
// Start session and execute
|
// Start session and execute
|
||||||
$request->getSession()->init($request);
|
$request->getSession()->init($request);
|
||||||
|
|
||||||
|
BIN
src/Dev/Install/client/images/arrows.png
Normal file
BIN
src/Dev/Install/client/images/arrows.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 1.8 KiB |
BIN
src/Dev/Install/client/images/network-save.gif
Normal file
BIN
src/Dev/Install/client/images/network-save.gif
Normal file
Binary file not shown.
After Width: | Height: | Size: 1.7 KiB |
BIN
src/Dev/Install/client/images/question.png
Normal file
BIN
src/Dev/Install/client/images/question.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 343 B |
@ -273,7 +273,7 @@
|
|||||||
|
|
||||||
<span id="saving_top" style="display: none">
|
<span id="saving_top" style="display: none">
|
||||||
|
|
||||||
<img src="<?=FRAMEWORK_NAME; ?>/images/network-save.gif" alt="Saving">
|
<img src="<?=FRAMEWORK_NAME; ?>/src/Dev/Install/client/images/network-save.gif" alt="Saving">
|
||||||
(this will take a minute or so)
|
(this will take a minute or so)
|
||||||
</span>
|
</span>
|
||||||
</p>
|
</p>
|
||||||
|
Loading…
Reference in New Issue
Block a user