update Piwik to version 2.16 (fixes #91)
This commit is contained in:
parent
9abe039dc8
commit
47263617c5
5833 changed files with 418860 additions and 226988 deletions
|
|
@ -1,6 +1,6 @@
|
|||
<?php
|
||||
/**
|
||||
* Piwik - Open source web analytics
|
||||
* Piwik - free/libre analytics platform
|
||||
*
|
||||
* @link http://piwik.org
|
||||
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
|
||||
|
|
@ -8,32 +8,35 @@
|
|||
* @package Piwik
|
||||
*/
|
||||
|
||||
use Piwik\Error;
|
||||
use Piwik\ErrorHandler;
|
||||
use Piwik\ExceptionHandler;
|
||||
use Piwik\FrontController;
|
||||
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';
|
||||
Error::setErrorHandler();
|
||||
require_once PIWIK_INCLUDE_PATH . '/core/ExceptionHandler.php';
|
||||
ErrorHandler::registerErrorHandler();
|
||||
ExceptionHandler::setUp();
|
||||
}
|
||||
|
||||
FrontController::setUpSafeMode();
|
||||
|
||||
if(!defined('PIWIK_ENABLE_DISPATCH')) {
|
||||
if (!defined('PIWIK_ENABLE_DISPATCH')) {
|
||||
define('PIWIK_ENABLE_DISPATCH', true);
|
||||
}
|
||||
|
||||
if (PIWIK_ENABLE_DISPATCH) {
|
||||
$controller = FrontController::getInstance();
|
||||
$controller->init();
|
||||
$response = $controller->dispatch();
|
||||
$environment = new \Piwik\Application\Environment(null);
|
||||
$environment->init();
|
||||
|
||||
if (!is_null($response)) {
|
||||
echo $response;
|
||||
$controller = FrontController::getInstance();
|
||||
|
||||
try {
|
||||
$controller->init();
|
||||
$response = $controller->dispatch();
|
||||
|
||||
if (!is_null($response)) {
|
||||
echo $response;
|
||||
}
|
||||
} catch (Exception $ex) {
|
||||
ExceptionHandler::dieWithHtmlErrorPage($ex);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue