Merge pull request #1 from flarum/master

Some mall additions

.editorconfig

@@ -12,21 +12,8 @@ insert_final_newline = true
 indent_style = space
 indent_size = 2
 
-[*.js]
-indent_style = space
-indent_size = 2
-
-[*.{css,less}]
-indent_style = space
-indent_size = 2
-
-[*.html]
-indent_style = space
-indent_size = 2
-
 [*.{diff,md}]
 trim_trailing_whitespace = false
 
 [*.php]
-indent_style = space
 indent_size = 4

.htaccess

@@ -9,4 +9,7 @@
   RewriteCond %{REQUEST_FILENAME} !-f
   RewriteCond %{REQUEST_FILENAME} !-d
   RewriteRule ^(.*)$ index.php [QSA,L]
+  
+  # MultiViews can mess up our rewriting scheme
+  Options -MultiViews
 </IfModule>

flarum/flarum

@@ -12,6 +12,7 @@
 
 use Flarum\Console\GenerateExtensionCommand;
 use Flarum\Console\UpgradeCommand;
+use Flarum\Core;
 use Flarum\Install\Console\InstallCommand;
 use Symfony\Component\Console\Application;
 
@@ -19,7 +20,11 @@ $app = require_once __DIR__.'/bootstrap.php';
 
 $console = new Application('Flarum', $app::VERSION);
 
-$console->add(new InstallCommand($app));
+if (!Core::isInstalled()) {
+    $app->register(new \Flarum\Install\InstallServiceProvider($app));
+    $console->add(new InstallCommand($app));
+}
+
 $console->add(new UpgradeCommand($app));
 $console->add(new GenerateExtensionCommand($app));
 

index.php

@@ -20,7 +20,7 @@ $app = require __DIR__.'/flarum/bootstrap.php';
 // If Flarum's configuration exists, then we can assume that installation has
 // been completed. We will set up a middleware pipe to route the request through
 // to one of the main forum actions.
-if ($app->bound('flarum.config')) {
+if (Core::isInstalled()) {
     $app->register('Flarum\Forum\ForumServiceProvider');
 
     $flarum = new MiddlewarePipe();