diff options
| author | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-05-13 00:36:16 -0500 |
|---|---|---|
| committer | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-05-13 00:36:16 -0500 |
| commit | 4e073eb818fc377ced5471c704d0755b0e5494e6 (patch) | |
| tree | 5e0055151c517b59dc188cd89c378acc46730e2a | |
| parent | a4d6486d8061049f5c40e971463b171f4ee33708 (diff) | |
| parent | 7d66a9ad525049b8df453ba0325e3dd38fb1157a (diff) | |
| download | forums-4e073eb818fc377ced5471c704d0755b0e5494e6.tar forums-4e073eb818fc377ced5471c704d0755b0e5494e6.tar.gz forums-4e073eb818fc377ced5471c704d0755b0e5494e6.tar.bz2 forums-4e073eb818fc377ced5471c704d0755b0e5494e6.tar.xz forums-4e073eb818fc377ced5471c704d0755b0e5494e6.zip | |
Merge branch 'ticket/11413' of github.com:EXreaction/phpbb3 into ticket/11413
| -rw-r--r-- | phpBB/includes/db/migration/data/310/notifications_schema_fix.php (renamed from phpBB/includes/db/migration/data/310/notifications2.php) | 2 | ||||
| -rw-r--r-- | phpBB/includes/notification/manager.php | 2 | ||||
| -rw-r--r-- | phpBB/language/en/common.php | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/phpBB/includes/db/migration/data/310/notifications2.php b/phpBB/includes/db/migration/data/310/notifications_schema_fix.php index ce8343089f..27e63e10d0 100644 --- a/phpBB/includes/db/migration/data/310/notifications2.php +++ b/phpBB/includes/db/migration/data/310/notifications_schema_fix.php @@ -7,7 +7,7 @@ * */ -class phpbb_db_migration_data_310_notifications2 extends phpbb_db_migration +class phpbb_db_migration_data_310_notifications_schema_fix extends phpbb_db_migration { static public function depends_on() { diff --git a/phpBB/includes/notification/manager.php b/phpBB/includes/notification/manager.php index a9eb503fb8..bf437e95f0 100644 --- a/phpBB/includes/notification/manager.php +++ b/phpBB/includes/notification/manager.php @@ -873,7 +873,7 @@ class phpbb_notification_manager { if (!isset($this->notification_types[$notification_type_name]) && !isset($this->notification_types['notification.type.' . $notification_type_name])) { - throw new phpbb_notification_exception('Notification type ' . $notification_type_name . ' does not exist'); + throw new phpbb_notification_exception($user->lang('NOTIFICATION_TYPE_NOT_EXIST', $notification_type_name)); } $sql = 'INSERT INTO ' . $this->notification_types_table . ' ' . $this->db->sql_build_array('INSERT', array( diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index c1d6ef4af3..47a77d1dee 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -424,6 +424,7 @@ $lang = array_merge($lang, array( 'NOTIFICATION_TOPIC_APPROVED' => 'Your topic "%2$s" in the forum "%3$s" was approved.', 'NOTIFICATION_TOPIC_DISAPPROVED' => 'Your topic "%1$s" was disapproved for reason: "%2$s".', 'NOTIFICATION_TOPIC_IN_QUEUE' => 'A new topic titled "%2$s" was posted by %1$s and needs approval.', + 'NOTIFICATION_TYPE_NOT_EXIST' => 'The notification type "%s" is missing from the file system.', 'NOTIFY_ADMIN' => 'Please notify the board administrator or webmaster.', 'NOTIFY_ADMIN_EMAIL' => 'Please notify the board administrator or webmaster: <a href="mailto:%1$s">%1$s</a>', 'NO_ACCESS_ATTACHMENT' => 'You are not allowed to access this file.', |