Load autoloader early so setup can use it

Also fixes a @include_once check that is now much easier.
This commit is contained in:
Lucas Bickel 2017-02-28 12:25:24 +01:00
parent 1ca47d67d5
commit 4936b16bc1
2 changed files with 3 additions and 3 deletions

View file

@ -44,7 +44,9 @@ set_include_path(VENDOR_PATH . PATH_SEPARATOR . get_include_path());
// Ensure library/ is on include_path
set_include_path(LIB_PATH . PATH_SEPARATOR . get_include_path());
if (!@include_once(VENDOR_PATH . 'propel/propel1/runtime/lib/Propel.php'))
require_once VENDOR_PATH . '/autoload.php';
if (!class_exists('Propel'))
{
die('Error: Propel not found. Did you install Airtime\'s third-party dependencies with composer? (Check the README.)');
}

View file

@ -1,7 +1,5 @@
<?php
require_once dirname(dirname( __DIR__)) . '/library/php-amqplib/amqp.inc';
/**
* User: sourcefabric
* Date: 02/12/14