aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorNathaniel Guse <nathaniel.guse@gmail.com>2013-04-29 21:42:14 -0500
committerNathaniel Guse <nathaniel.guse@gmail.com>2013-04-29 21:42:14 -0500
commit7bda5a016a726711855fb7a749f9f3638e63d1e3 (patch)
tree088dce199cadf39f55b3fad288a27a1768236d39 /phpBB/includes
parent33287a73609a99f33f3d0718fceaf72e39d5283e (diff)
downloadforums-7bda5a016a726711855fb7a749f9f3638e63d1e3.tar
forums-7bda5a016a726711855fb7a749f9f3638e63d1e3.tar.gz
forums-7bda5a016a726711855fb7a749f9f3638e63d1e3.tar.bz2
forums-7bda5a016a726711855fb7a749f9f3638e63d1e3.tar.xz
forums-7bda5a016a726711855fb7a749f9f3638e63d1e3.zip
[ticket/11413] Prevent recursive function calls
PHPBB3-11413
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/notification/manager.php5
1 files changed, 4 insertions, 1 deletions
diff --git a/phpBB/includes/notification/manager.php b/phpBB/includes/notification/manager.php
index e7d6af71b8..a9eb503fb8 100644
--- a/phpBB/includes/notification/manager.php
+++ b/phpBB/includes/notification/manager.php
@@ -871,7 +871,10 @@ class phpbb_notification_manager
if (!isset($notification_type_ids[$notification_type_name]))
{
- $notification_type = $this->get_item_type_class($notification_type_name);
+ 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');
+ }
$sql = 'INSERT INTO ' . $this->notification_types_table . ' ' . $this->db->sql_build_array('INSERT', array(
'notification_type_name' => $notification_type_name,