Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthieu Napoli <matthieu@mnapoli.fr>2014-12-22 05:32:45 +0300
committerMatthieu Napoli <matthieu@mnapoli.fr>2014-12-22 05:36:48 +0300
commitb4af652dd9284f5565ba658389840a47dac48211 (patch)
tree229f6e65e3112cd9f7ef6741666a7299e463c081 /console
parent939d1c1be832472204aa000f003d1eba20a1edbb (diff)
Moved common bootstrap code in a `core/bootstrap.php` file
This file is not in a class because it needs to be compatible with PHP 4.
Diffstat (limited to 'console')
-rwxr-xr-xconsole17
1 files changed, 5 insertions, 12 deletions
diff --git a/console b/console
index 020b0d2706..9bc11d38ec 100755
--- a/console
+++ b/console
@@ -11,18 +11,11 @@ if (file_exists(PIWIK_DOCUMENT_ROOT . '/bootstrap.php')) {
if (!defined('PIWIK_INCLUDE_PATH')) {
define('PIWIK_INCLUDE_PATH', PIWIK_DOCUMENT_ROOT);
}
-if (!defined('PIWIK_USER_PATH')) {
- define('PIWIK_USER_PATH', PIWIK_DOCUMENT_ROOT);
-}
-
-require_once PIWIK_INCLUDE_PATH . '/core/testMinimumPhpVersion.php';
-@date_default_timezone_set('UTC');
+require_once PIWIK_INCLUDE_PATH . '/core/bootstrap.php';
require_once PIWIK_INCLUDE_PATH . '/core/Loader.php';
-\Piwik\Loader::init();
-
-require_once PIWIK_INCLUDE_PATH . '/libs/upgradephp/upgrade.php';
+Piwik\Loader::init();
Piwik\Translate::loadEnglishTranslation();
@@ -31,9 +24,9 @@ if (!Piwik\Common::isPhpCliMode()) {
}
if (!defined('PIWIK_ENABLE_ERROR_HANDLER') || PIWIK_ENABLE_ERROR_HANDLER) {
- \Piwik\ErrorHandler::registerErrorHandler();
- \Piwik\ExceptionHandler::setUp();
+ Piwik\ErrorHandler::registerErrorHandler();
+ Piwik\ExceptionHandler::setUp();
}
$console = new Piwik\Console();
-$console->run(); \ No newline at end of file
+$console->run();