From 4936b16bc1dbf48b2322175e62e9ebe0dfe67de8 Mon Sep 17 00:00:00 2001 From: Lucas Bickel Date: Tue, 28 Feb 2017 12:25:24 +0100 Subject: [PATCH] Load autoloader early so setup can use it Also fixes a @include_once check that is now much easier. --- airtime_mvc/public/index.php | 4 +++- airtime_mvc/public/setup/rabbitmq-setup.php | 2 -- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/airtime_mvc/public/index.php b/airtime_mvc/public/index.php index 52c063be8..c3a4d6e43 100644 --- a/airtime_mvc/public/index.php +++ b/airtime_mvc/public/index.php @@ -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.)'); } diff --git a/airtime_mvc/public/setup/rabbitmq-setup.php b/airtime_mvc/public/setup/rabbitmq-setup.php index e8d210fec..f2f3a7ee8 100644 --- a/airtime_mvc/public/setup/rabbitmq-setup.php +++ b/airtime_mvc/public/setup/rabbitmq-setup.php @@ -1,7 +1,5 @@