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:
authordiosmosis <benaka@piwik.pro>2014-10-31 17:02:58 +0300
committerdiosmosis <benaka@piwik.pro>2014-10-31 17:02:58 +0300
commita7452975f88e72229f071921a1951d9786fc4b7b (patch)
tree3cf63a395b9e8ce1d1b36315fb7fe6028e6bff04 /core/FrontController.php
parent00ccddc3c4a3a9c454cacd6596878eef07867ff0 (diff)
Revert "Use interface to determine if an exception contains HTML message content."
This reverts commit 8e274dd6b36989dd7b20a3e2b17a5d2cf1db7107.
Diffstat (limited to 'core/FrontController.php')
-rw-r--r--core/FrontController.php5
1 files changed, 2 insertions, 3 deletions
diff --git a/core/FrontController.php b/core/FrontController.php
index 33dab49e47..0fa143d4b6 100644
--- a/core/FrontController.php
+++ b/core/FrontController.php
@@ -13,7 +13,6 @@ use Exception;
use Piwik\API\Request;
use Piwik\API\ResponseBuilder;
use Piwik\Exceptions\HtmlMessageException;
-use Piwik\Exceptions\HtmlMessageExceptionInterface;
use Piwik\Http\Router;
use Piwik\Plugin\Controller;
use Piwik\Plugin\Report;
@@ -614,8 +613,8 @@ class FrontController extends Singleton
{
$debugTrace = $ex->getTraceAsString();
- if ($ex instanceof HtmlMessageExceptionInterface) {
- $message = $ex->getMessage();
+ if (method_exists($ex, 'getHtmlMessage')) {
+ $message = $ex->getHtmlMessage();
} else {
$message = Common::sanitizeInputValue($ex->getMessage());
}