Update functions.php (#1821)

2017-01-31 04:25:04 -05:00
parent 7cd63be1bc
commit 67818ee90c
1 changed files with 8 additions and 6 deletions
--- a/functions.php
+++ b/functions.php
@@ -27,13 +27,15 @@ if (version_compare('5.6.4', phpversion(), '>=')) {
 /**
 * Ensure dependencies are loaded
 */
-if (!file_exists($composer = __DIR__.'/vendor/autoload.php') && !class_exists('Roots\\Sage\\Container')) {
+if (!class_exists('Roots\\Sage\\Container')) {
+    if (!file_exists($composer = __DIR__.'/vendor/autoload.php')) {
        $sage_error(
            __('You must run <code>composer install</code> from the Sage directory.', 'sage'),
            __('Autoloader not found.', 'sage')
        );
+    }
+    require_once $composer;
 }
-require_once $composer;

 /**
 * Sage required files