mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-07-22 09:11:19 +02:00
Code Issues Releases Wiki Activity

Fix installation regressions

Browse Source
This commit is contained in:
Toby Zerner
2015-10-13 15:55:18 +10:30
parent 3974235455
commit 27a2b616c4
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
framework/core/src/Foundation/Application.php
View File

@@ -138,7 +138,7 @@ class Application extends Container implements ApplicationContract
*/ */
public function url($path = null) public function url($path = null)
{ {
$config = $this->make('flarum.config'); $config = $this->isInstalled() ? $this->make('flarum.config') : [];
$url = array_get($config, 'url', $_SERVER['REQUEST_URI']); $url = array_get($config, 'url', $_SERVER['REQUEST_URI']);
if (is_array($url)) { if (is_array($url)) {

2
framework/core/src/Install/Console/InstallCommand.php
View File

@@ -231,6 +231,8 @@ class InstallCommand extends AbstractCommand
$this->info('Writing default settings'); $this->info('Writing default settings');
$settings->set('version', $this->application->version());
foreach ($this->settings as $k => $v) { foreach ($this->settings as $k => $v) {
$settings->set($k, $v); $settings->set($k, $v);
} }

4
framework/core/src/Install/InstallServiceProvider.php
View File

@@ -42,6 +42,8 @@ class InstallServiceProvider extends AbstractServiceProvider
$this->app->singleton('flarum.install.routes', function () { $this->app->singleton('flarum.install.routes', function () {
return $this->getRoutes(); return $this->getRoutes();
}); });
$this->loadViewsFrom(__DIR__.'/../../views/install', 'flarum.install');
} }
/** /**
@@ -56,7 +58,7 @@ class InstallServiceProvider extends AbstractServiceProvider
$routes->get( $routes->get(
'/', '/',
'index', 'index',
$toController('Flarum\Install\Controller\IndexAction') $toController('Flarum\Install\Controller\IndexController')
); );
$routes->post( $routes->post(