Merge branch 'master' into feature/35-travis

joomlatools · Sep 25, 2017 · 4de1f61 · 4de1f61
2 parents 4685e4b + 37a9c77
commit 4de1f61
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/Joomlatools/Joomla/Application.php b/src/Joomlatools/Joomla/Application.php
@@ -454,7 +454,12 @@ public static function getRouter($name = 'administrator', array $options = array
      */
     protected function _setupLogging($loglevel)
     {
-        require_once JPATH_LIBRARIES . '/joomla/log/log.php';
+        // Backwards compatibility
+        if (file_exists(JPATH_LIBRARIES . '/src/Log/Log.php')) {
+          require_once JPATH_LIBRARIES . '/src/Log/Log.php';
+        } else {
+          require_once JPATH_LIBRARIES . '/joomla/log/log.php';
+        }
 
         if ($loglevel == OutputInterface::VERBOSITY_NORMAL) {
             return;

diff --git a/src/Joomlatools/Joomla/Bootstrapper.php b/src/Joomlatools/Joomla/Bootstrapper.php
@@ -181,6 +181,8 @@ protected function _bootstrap()
 
             require_once JPATH_ROOT . '/app/defines.php';
             require_once JPATH_ROOT . '/app/bootstrap.php';
+
+            require_once JPATH_LIBRARIES . '/import.php';
         }
         else
         {
@@ -191,7 +193,6 @@ protected function _bootstrap()
             require_once JPATH_BASE . '/includes/framework.php';
         }
 
-        require_once JPATH_LIBRARIES . '/import.php';
         require_once JPATH_LIBRARIES . '/cms.php';
 
         $this->_bootstrapped = true;