From a7452975f88e72229f071921a1951d9786fc4b7b Mon Sep 17 00:00:00 2001 From: diosmosis Date: Fri, 31 Oct 2014 07:02:58 -0700 Subject: Revert "Use interface to determine if an exception contains HTML message content." This reverts commit 8e274dd6b36989dd7b20a3e2b17a5d2cf1db7107. --- core/FrontController.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'core/FrontController.php') 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()); } -- cgit v1.2.3