diff options
Diffstat (limited to 'piwik.php')
-rw-r--r-- | piwik.php | 19 |
1 files changed, 7 insertions, 12 deletions
@@ -40,6 +40,13 @@ if (!defined('PIWIK_INCLUDE_PATH')) { @ignore_user_abort(true); +if (file_exists(PIWIK_INCLUDE_PATH . '/vendor/autoload.php')) { + $vendorDirectory = PIWIK_INCLUDE_PATH . '/vendor'; +} else { + $vendorDirectory = PIWIK_INCLUDE_PATH . '/../..'; +} +require_once $vendorDirectory . '/autoload.php'; + require_once PIWIK_INCLUDE_PATH . '/core/Plugin/Controller.php'; require_once PIWIK_INCLUDE_PATH . '/core/Plugin/ControllerAdmin.php'; @@ -78,18 +85,6 @@ require_once PIWIK_INCLUDE_PATH . '/core/Filesystem.php'; require_once PIWIK_INCLUDE_PATH . '/core/Cookie.php'; require_once PIWIK_INCLUDE_PATH . '/core/Loader.php'; -/* - * Manually require needed vendor libraries, as composers autorequire would do too much - */ -if (file_exists(PIWIK_INCLUDE_PATH . '/vendor/autoload.php')) { - $vendorDirectory = PIWIK_INCLUDE_PATH . '/vendor'; -} else { - $vendorDirectory = PIWIK_INCLUDE_PATH . '/../..'; -} -require_once $vendorDirectory . '/autoload.php'; -require_once $vendorDirectory . '/mustangostang/spyc/Spyc.php'; -require_once $vendorDirectory . '/piwik/device-detector/DeviceDetector.php'; - session_cache_limiter('nocache'); @date_default_timezone_set('UTC'); |