phpBB

Code Changes

File: phpbb/notification/method/messenger_base.php

  Unmodified   Added   Modified   Removed
Line 69Line 69

$user = $this->user_loader->get_user($notification->user_id);



$user = $this->user_loader->get_user($notification->user_id);


			if ($user['user_type'] == USER_IGNORE || in_array($notification->user_id, $banned_users))

			if ($user['user_type'] == USER_IGNORE || ($user['user_type'] == USER_INACTIVE && $user['user_inactive_reason'] == INACTIVE_MANUAL) || in_array($notification->user_id, $banned_users))

			{
continue;
}


			{
continue;
}


			$messenger->template($template_dir_prefix . $notification->get_email_template(), $user['user_lang']);

			$messenger->template($notification->get_email_template(), $user['user_lang'], '', $template_dir_prefix);


$messenger->set_addresses($user);

$messenger->assign_vars(array_merge(array(
'USERNAME' => $user['username'],



$messenger->set_addresses($user);

$messenger->assign_vars(array_merge(array(
'USERNAME' => $user['username'],


				'U_NOTIFICATION_SETTINGS'		=> generate_board_url() . '/ucp.' . $this->php_ext . '?i=ucp_notifications',

				'U_NOTIFICATION_SETTINGS'		=> generate_board_url() . '/ucp.' . $this->php_ext . '?i=ucp_notifications&mode=notification_options',

			), $notification->get_email_template_variables()));

$messenger->send($notify_method);

			), $notification->get_email_template_variables()));

$messenger->send($notify_method);