github
/
flarum
mirror of https://github.com/flarum/flarum
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Boot app before attempting upgrade

pull/11/head
Toby Zerner 2015-09-14 18:58:14 +09:30
parent 38b832bbf7
commit 7d257565cc
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
flarum/bootstrap.php
View File

@ -111,26 +111,6 @@ if (Core::isInstalled()) {
$app->register(new \Flarum\Core\CoreServiceProvider($app)); $app->register(new \Flarum\Core\CoreServiceProvider($app));
// If the version stored in the database doesn't match the version of the
// code, then run the upgrade script (migrations). This is temporary - a
// proper, more secure upgrade method is planned.
if ($settings->get('version') !== $app::VERSION) {
$input = new \Symfony\Component\Console\Input\StringInput('');
$output = new \Symfony\Component\Console\Output\BufferedOutput;
app('Flarum\Console\UpgradeCommand')->run($input, $output);
$settings->set('version', $app::VERSION);
app('flarum.formatter')->flush();
$forum = app('Flarum\Forum\Actions\ClientAction');
$forum->flushAssets();
$admin = app('Flarum\Admin\Actions\ClientAction');
$admin->flushAssets();
}
$config->set('mail.driver', Core::config('mail_driver')); $config->set('mail.driver', Core::config('mail_driver'));
$config->set('mail.host', Core::config('mail_host')); $config->set('mail.host', Core::config('mail_host'));
$config->set('mail.port', Core::config('mail_port')); $config->set('mail.port', Core::config('mail_port'));
@ -146,4 +126,24 @@ if (Core::isInstalled()) {
$app->boot(); $app->boot();
// If the version stored in the database doesn't match the version of the
// code, then run the upgrade script (migrations). This is temporary - a
// proper, more secure upgrade method is planned.
if (Core::isInstalled() && $settings->get('version') !== $app::VERSION) {
$input = new \Symfony\Component\Console\Input\StringInput('');
$output = new \Symfony\Component\Console\Output\BufferedOutput;
app('Flarum\Console\UpgradeCommand')->run($input, $output);
$settings->set('version', $app::VERSION);
app('flarum.formatter')->flush();
$forum = app('Flarum\Forum\Actions\ClientAction');
$forum->flushAssets();
$admin = app('Flarum\Admin\Actions\ClientAction');
$admin->flushAssets();
}
return $app; return $app;