From 2752751959e2235f6673cd94748c48f59a6c62a9 Mon Sep 17 00:00:00 2001
From: Toby Zerner <toby.zerner@gmail.com>
Date: Thu, 13 Aug 2015 10:13:08 +0930
Subject: [PATCH] Update paths

---
 Vagrantfile          | 2 +-
 flarum/bootstrap.php | 8 +++++---
 index.php            | 4 +---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index 7f4e43c..24fa3ca 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -318,6 +318,6 @@ Vagrant.configure("2") do |config|
   # Any local scripts you may want to run post-provisioning.
   # Add these to the same directory as the Vagrantfile.
   ##########
-  config.vm.provision "shell", path: "./system/vagrant/environment.sh", privileged: false
+  config.vm.provision "shell", path: "./flarum/vagrant/environment.sh", privileged: false
 
 end
diff --git a/flarum/bootstrap.php b/flarum/bootstrap.php
index ed995cd..1371a85 100644
--- a/flarum/bootstrap.php
+++ b/flarum/bootstrap.php
@@ -3,9 +3,11 @@ define('LARAVEL_START', microtime(true));
 
 require __DIR__.'/vendor/autoload.php';
 
-// Temp while studio doesn't autoload files
-require __DIR__.'/core/src/helpers.php';
-require __DIR__.'/core/vendor/swiftmailer/swiftmailer/lib/swift_required.php';
+// Temp while franzliedke/studio doesn't autoload files
+if (file_exists(__DIR__.'/core')) {
+    require __DIR__.'/core/src/helpers.php';
+    require __DIR__.'/core/vendor/swiftmailer/swiftmailer/lib/swift_required.php';
+}
 
 $app = new Flarum\Core\Application(
 	realpath(__DIR__)
diff --git a/index.php b/index.php
index 0bce1ce..d531aaa 100644
--- a/index.php
+++ b/index.php
@@ -1,13 +1,11 @@
 <?php
 
 use Flarum\Core;
-use Psr\Http\Message\ResponseInterface as Response;
-use Psr\Http\Message\ServerRequestInterface as Request;
 use Zend\Diactoros\Server;
 use Zend\Stratigility\MiddlewarePipe;
 
 // Instantiate the application, register providers etc.
-$app = require __DIR__.'/system/bootstrap.php';
+$app = require __DIR__.'/flarum/bootstrap.php';
 
 // Set up everything we need for the frontend
 $app->register('Flarum\Forum\ForumServiceProvider');