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

Update paths

pull/9/head
Toby Zerner 2015-08-13 10:13:08 +09:30
parent 733e3f79c8
commit 2752751959
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Vagrantfile vendored
View File

@ -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

8
flarum/bootstrap.php
View File

@ -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__)

4
index.php
View File

@ -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');