3 files changed, 44 insertions, 43 deletions
diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php
index 8cae0151c8..865810687b 100644
--- a/phpBB/includes/acp/acp_groups.php
+++ b/phpBB/includes/acp/acp_groups.php
@@ -148,57 +148,58 @@ class acp_groups
 						'action'	=> $action))
 					);
 				}
+			break;
 
-				break;
 			case 'set_default_on_all':
-					if (confirm_box(true))
-					{
-						$group_name = ($group_row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $group_row['group_name']] : $group_row['group_name'];
-							
-						$start = 0;
+				if (confirm_box(true))
+				{
+					$group_name = ($group_row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $group_row['group_name']] : $group_row['group_name'];
+
+					$start = 0;
 
-						do
+					do
+					{
+						$sql = 'SELECT user_id
+							FROM ' . USER_GROUP_TABLE . "
+							WHERE group_id = $group_id
+							ORDER BY user_id";
+						$result = $db->sql_query_limit($sql, 200, $start);
+
+						$mark_ary = array();
+						if ($row = $db->sql_fetchrow($result))
 						{
-							$sql = 'SELECT user_id
-								FROM ' . USER_GROUP_TABLE . "
-								WHERE group_id = $group_id
-								ORDER BY user_id";
-							$result = $db->sql_query_limit($sql, 200, $start);
-
-							$mark_ary = array();
-							if ($row = $db->sql_fetchrow($result))
+							do
 							{
-								do
-								{
-									$mark_ary[] = $row['user_id'];
-								}
-								while ($row = $db->sql_fetchrow($result));
+								$mark_ary[] = $row['user_id'];
+							}
+							while ($row = $db->sql_fetchrow($result));
 
-								group_user_attributes('default', $group_id, $mark_ary, false, $group_name, $group_row);
+							group_user_attributes('default', $group_id, $mark_ary, false, $group_name, $group_row);
 
-								$start = (sizeof($mark_ary) < 200) ? 0 : $start + 200;
-							}
-							else
-							{
-								$start = 0;
-							}
-							$db->sql_freeresult($result);
+							$start = (sizeof($mark_ary) < 200) ? 0 : $start + 200;
 						}
-						while ($start);
-							
-						trigger_error($user->lang['GROUP_DEFS_UPDATED'] . adm_back_link($this->u_action . '&amp;action=list&amp;g=' . $group_id));
-					}
-					else
-					{
-						confirm_box(false, $user->lang['CONFIRM_OPERATION'], build_hidden_fields(array(
-							'mark'		=> $mark_ary,
-							'g'			=> $group_id,
-							'i'			=> $id,
-							'mode'		=> $mode,
-							'action'	=> $action))
-						);
+						else
+						{
+							$start = 0;
+						}
+						$db->sql_freeresult($result);
 					}
+					while ($start);
+
+					trigger_error($user->lang['GROUP_DEFS_UPDATED'] . adm_back_link($this->u_action . '&amp;action=list&amp;g=' . $group_id));
+				}
+				else
+				{
+					confirm_box(false, $user->lang['CONFIRM_OPERATION'], build_hidden_fields(array(
+						'mark'		=> $mark_ary,
+						'g'			=> $group_id,
+						'i'			=> $id,
+						'mode'		=> $mode,
+						'action'	=> $action))
+					);
+				}
 			break;
+
 			case 'deleteusers':
 				if (empty($mark_ary))
 				{
diff --git a/phpBB/includes/notification/method/email.php b/phpBB/includes/notification/method/email.php
index dc505c0d41..44666b1422 100644
--- a/phpBB/includes/notification/method/email.php
+++ b/phpBB/includes/notification/method/email.php
@@ -21,7 +21,7 @@ if (!defined('IN_PHPBB'))
 *
 * @package notifications
 */
-class phpbb_notification_method_email extends phpbb_notification_method_base
+class phpbb_notification_method_email extends phpbb_notification_method_messenger_base
 {
 	/**
 	* Get notification method name
diff --git a/phpBB/includes/notification/method/messenger_base.php b/phpBB/includes/notification/method/messenger_base.php
index ce1ecc09ce..2f9073e80b 100644
--- a/phpBB/includes/notification/method/messenger_base.php
+++ b/phpBB/includes/notification/method/messenger_base.php
@@ -78,7 +78,7 @@ abstract class phpbb_notification_method_messenger_base extends phpbb_notificati
 				continue;
 			}
 
-			$messenger->template($email_template_base_dir . $notification->get_email_template(), $user['user_lang']);
+			$messenger->template($template_dir_prefix . $notification->get_email_template(), $user['user_lang']);
 
 			$messenger->to($user['user_email'], $user['username']);