From 71d0f94caa6277e4f2019aaf696264c766672a13 Mon Sep 17 00:00:00 2001 From: Alexander Ebert Date: Fri, 4 Nov 2011 15:02:32 +0100 Subject: [PATCH] Changed getMessage() to _getMessage() Some retard at PHP thought it may be clever to define getMessage() as final for no reason. --- .../files/lib/system/exception/AJAXException.class.php | 2 +- .../files/lib/system/exception/LoggedException.class.php | 4 ++-- .../files/lib/system/exception/NamedUserException.class.php | 2 +- .../files/lib/system/exception/SystemException.class.php | 6 +++--- .../files/lib/system/exception/UserException.class.php | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/wcfsetup/install/files/lib/system/exception/AJAXException.class.php b/wcfsetup/install/files/lib/system/exception/AJAXException.class.php index 3dd6ea2305..92a459755a 100644 --- a/wcfsetup/install/files/lib/system/exception/AJAXException.class.php +++ b/wcfsetup/install/files/lib/system/exception/AJAXException.class.php @@ -30,7 +30,7 @@ class AJAXException extends LoggedException { } else { $responseData = array( - 'message' => $this->getMessage() + 'message' => $this->_getMessage() ); } diff --git a/wcfsetup/install/files/lib/system/exception/LoggedException.class.php b/wcfsetup/install/files/lib/system/exception/LoggedException.class.php index 053de2ca23..6c06b2c846 100644 --- a/wcfsetup/install/files/lib/system/exception/LoggedException.class.php +++ b/wcfsetup/install/files/lib/system/exception/LoggedException.class.php @@ -20,9 +20,9 @@ class LoggedExceptions extends \Exception { * @param boolean $raw * @see \Exception::getMessage() */ - public function getMessage($raw = false) { + public function _getMessage($raw = false) { if ($raw) { - return parent::getMessage(); + return $this->getMessage(); } return 'An error occured. Sorry.'; diff --git a/wcfsetup/install/files/lib/system/exception/NamedUserException.class.php b/wcfsetup/install/files/lib/system/exception/NamedUserException.class.php index e77d125090..76058eb660 100644 --- a/wcfsetup/install/files/lib/system/exception/NamedUserException.class.php +++ b/wcfsetup/install/files/lib/system/exception/NamedUserException.class.php @@ -30,7 +30,7 @@ class NamedUserException extends UserException { 'name' => get_class($this), 'file' => $this->getFile(), 'line' => $this->getLine(), - 'message' => $this->getMessage(), + 'message' => $this->_getMessage(), 'stacktrace' => $this->getTraceAsString() )); WCF::getTPL()->display('userException'); diff --git a/wcfsetup/install/files/lib/system/exception/SystemException.class.php b/wcfsetup/install/files/lib/system/exception/SystemException.class.php index 584ce62f95..312c246996 100644 --- a/wcfsetup/install/files/lib/system/exception/SystemException.class.php +++ b/wcfsetup/install/files/lib/system/exception/SystemException.class.php @@ -80,7 +80,7 @@ class SystemException extends LoggedException implements IPrintableException { - Fatal error: <?php echo StringUtil::encodeHTML($this->getMessage()); ?> + Fatal error: <?php echo StringUtil::encodeHTML($this->_getMessage()); ?>