diff options
| -rw-r--r-- | CHANGELOG.md | 3 | ||||
| -rwxr-xr-x | console | 4 | ||||
| -rw-r--r-- | core/Common.php | 2 | ||||
| -rw-r--r-- | core/ErrorHandler.php | 2 | ||||
| -rw-r--r-- | core/Tracker.php | 2 | ||||
| -rw-r--r-- | core/dispatch.php | 4 | ||||
| m--------- | tests/PHPUnit/UI | 0 |
7 files changed, 6 insertions, 11 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index a2345d0825..839b01c6e8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,8 +26,7 @@ This is a changelog for Piwik platform developers. All changes for our HTTP API' * The API method `UserSettings.getBrowserType` is deprecated and will be removed from May 1st 2015. Use `DevicesDetection.getBrowserEngines` instead * The API method `UserSettings.getResolution` is deprecated and will be removed from May 1st 2015. Use `Resolution.getResolution` instead * The API method `UserSettings.getConfiguration` is deprecated and will be removed from May 1st 2015. Use `Resolution.getConfiguration` instead -* The API method `UserSettings.getWideScreen` has been removed -* The API method `UserSettings.getWideScreen` is deprecated and will be removed from May 1st 2015. Use `UserSettings.getScreenType` instead +* The API method `UserSettings.getWideScreen` has been removed. Use `UserSettings.getScreenType` instead. * `Piwik\SettingsPiwik::rewriteTmpPathWithInstanceId()` has been deprecated. Instead of hardcoding the `tmp/` path everywhere in the codebase and then calling `rewriteTmpPathWithInstanceId()`, developers should get the `path.tmp` configuration value from the DI container (e.g. `StaticContainer::getContainer()->get('path.tmp')`). * The method `Piwik\Log::setLogLevel()` has been deprecated * The method `Piwik\Log::getLogLevel()` has been deprecated @@ -26,9 +26,7 @@ if (!Piwik\Common::isPhpCliMode()) { } if (!defined('PIWIK_ENABLE_ERROR_HANDLER') || PIWIK_ENABLE_ERROR_HANDLER) { - require_once PIWIK_INCLUDE_PATH . '/core/Error.php'; - \Piwik\ErrorHandler::setErrorHandler(); - require_once PIWIK_INCLUDE_PATH . '/core/ExceptionHandler.php'; + \Piwik\ErrorHandler::registerErrorHandler(); \Piwik\ExceptionHandler::setUp(); } diff --git a/core/Common.php b/core/Common.php index 17368001d5..5e09c62934 100644 --- a/core/Common.php +++ b/core/Common.php @@ -1237,7 +1237,7 @@ class Common * @todo This method is weird, it's debugging statements but seem to only work for the tracker, maybe it * should be moved elsewhere */ - public static function printDebug($info = '') + public static function printDebug($info = '') { if (isset($GLOBALS['PIWIK_TRACKER_DEBUG']) && $GLOBALS['PIWIK_TRACKER_DEBUG']) { diff --git a/core/ErrorHandler.php b/core/ErrorHandler.php index 2bd22f4002..93d5ea874b 100644 --- a/core/ErrorHandler.php +++ b/core/ErrorHandler.php @@ -59,7 +59,7 @@ class ErrorHandler } } - public static function setErrorHandler() + public static function registerErrorHandler() { set_error_handler(array('Piwik\ErrorHandler', 'errorHandler')); } diff --git a/core/Tracker.php b/core/Tracker.php index 69350ba82e..802f025cca 100644 --- a/core/Tracker.php +++ b/core/Tracker.php @@ -76,7 +76,7 @@ class Tracker \Piwik\FrontController::createConfigObject(); if ($this->isDebugModeEnabled()) { - ErrorHandler::setErrorHandler(); + ErrorHandler::registerErrorHandler(); ExceptionHandler::setUp(); Common::printDebug("Debug enabled - Input parameters: "); diff --git a/core/dispatch.php b/core/dispatch.php index 803995650f..1359dd8ee5 100644 --- a/core/dispatch.php +++ b/core/dispatch.php @@ -16,9 +16,7 @@ use Piwik\Plugin\ControllerAdmin as PluginControllerAdmin; PluginControllerAdmin::disableEacceleratorIfEnabled(); if (!defined('PIWIK_ENABLE_ERROR_HANDLER') || PIWIK_ENABLE_ERROR_HANDLER) { - require_once PIWIK_INCLUDE_PATH . '/core/Error.php'; - ErrorHandler::setErrorHandler(); - require_once PIWIK_INCLUDE_PATH . '/core/ExceptionHandler.php'; + ErrorHandler::registerErrorHandler(); ExceptionHandler::setUp(); } diff --git a/tests/PHPUnit/UI b/tests/PHPUnit/UI -Subproject 903002816d39732aa2b2e8d33286725e60c9a4f +Subproject 185ea7d3a75041a44cd033695e3895426090ab7 |