diff options
| author | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-05-02 13:21:21 +0200 |
|---|---|---|
| committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-05-02 13:21:21 +0200 |
| commit | 2f480be02d25421fa4c372c103604f24d4adf0ab (patch) | |
| tree | 2f4a353b340a7dd60ed63bdf6177aeeb426fc0c9 /phpBB/phpbb/notification | |
| parent | e51571eaa3b52a5a344cc847b51049c67642f6ff (diff) | |
| parent | 57072a1e28061ff51148c7d6a0c47664f0060639 (diff) | |
| download | forums-2f480be02d25421fa4c372c103604f24d4adf0ab.tar forums-2f480be02d25421fa4c372c103604f24d4adf0ab.tar.gz forums-2f480be02d25421fa4c372c103604f24d4adf0ab.tar.bz2 forums-2f480be02d25421fa4c372c103604f24d4adf0ab.tar.xz forums-2f480be02d25421fa4c372c103604f24d4adf0ab.zip | |
Merge pull request #3565 from MateBartus/ticket/13793
[ticket/13793] Remove translation on throwing exceptions
Diffstat (limited to 'phpBB/phpbb/notification')
| -rw-r--r-- | phpBB/phpbb/notification/exception.php | 6 | ||||
| -rw-r--r-- | phpBB/phpbb/notification/manager.php | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/phpBB/phpbb/notification/exception.php b/phpBB/phpbb/notification/exception.php index 83c4526df7..e416438061 100644 --- a/phpBB/phpbb/notification/exception.php +++ b/phpBB/phpbb/notification/exception.php @@ -17,10 +17,6 @@ namespace phpbb\notification; * Notifications exception */ -class exception extends \Exception +class exception extends \phpbb\exception\runtime_exception { - public function __toString() - { - return $this->getMessage(); - } } diff --git a/phpBB/phpbb/notification/manager.php b/phpBB/phpbb/notification/manager.php index db92170dd8..38d7a13165 100644 --- a/phpBB/phpbb/notification/manager.php +++ b/phpBB/phpbb/notification/manager.php @@ -943,7 +943,7 @@ class manager { if (!isset($this->notification_types[$notification_type_name]) && !isset($this->notification_types['notification.type.' . $notification_type_name])) { - throw new \phpbb\notification\exception($this->user->lang('NOTIFICATION_TYPE_NOT_EXIST', $notification_type_name)); + throw new \phpbb\notification\exception('NOTIFICATION_TYPE_NOT_EXIST', array($notification_type_name)); } $sql = 'INSERT INTO ' . $this->notification_types_table . ' ' . $this->db->sql_build_array('INSERT', array( |