3 files changed, 17 insertions, 3 deletions
diff --git a/phpBB/includes/ucp/ucp_pm.php b/phpBB/includes/ucp/ucp_pm.php
index ab2b7b9b50..fdb6396133 100644
--- a/phpBB/includes/ucp/ucp_pm.php
+++ b/phpBB/includes/ucp/ucp_pm.php
@@ -129,6 +129,13 @@ class ucp_pm extends module
 				break;
 			
 			case 'options':
+				$sql = 'SELECT group_message_limit
+					FROM ' . GROUPS_TABLE . '
+					WHERE group_id = ' . $user->data['group_id'];
+				$result = $db->sql_query($sql);
+				$user->data['group_message_limit'] = (int) $db->sql_fetchfield('group_message_limit', 0, $result);
+				$db->sql_freeresult($result);
+
 				get_folder($user->data['user_id'], $folder);
 
 				include($phpbb_root_path . 'includes/ucp/ucp_pm_options.'.$phpEx);
@@ -145,6 +152,14 @@ class ucp_pm extends module
 
 			case 'unread':
 			case 'view_messages':
+
+				$sql = 'SELECT group_message_limit
+					FROM ' . GROUPS_TABLE . '
+					WHERE group_id = ' . $user->data['group_id'];
+				$result = $db->sql_query($sql);
+				$user->data['group_message_limit'] = (int) $db->sql_fetchfield('group_message_limit', 0, $result);
+				$db->sql_freeresult($result);
+			
 				if ($folder_specified)
 				{
 					$folder_id = $folder_specified;
diff --git a/phpBB/includes/ucp/ucp_pm_options.php b/phpBB/includes/ucp/ucp_pm_options.php
index 53946e3c00..a07b8e3aee 100644
--- a/phpBB/includes/ucp/ucp_pm_options.php
+++ b/phpBB/includes/ucp/ucp_pm_options.php
@@ -409,7 +409,7 @@ function message_options($id, $mode, $global_privmsgs_rules, $global_rule_condit
 	$rule_lang = $action_lang = $check_lang = array();
 
 	// Build all three language arrays
-	preg_replace('#(?:)((RULE|ACTION|CHECK)_([A-Z0-9_]+))(?:)#e', "\${strtolower('\\2') . '_lang'}[constant('\\1')] = \$user->lang['PM_\\2']['\\3']", implode(':', array_keys(get_defined_constants())));
+	preg_replace('#^((RULE|ACTION|CHECK)_([A-Z0-9_]+))$#e', "\${strtolower('\\2') . '_lang'}[constant('\\1')] = \$user->lang['PM_\\2']['\\3']", array_keys(get_defined_constants()));
 
 	/*
 		Rule Ordering:
diff --git a/phpBB/includes/ucp/ucp_zebra.php b/phpBB/includes/ucp/ucp_zebra.php
index ca07234fc7..cdc5f9ca4b 100644
--- a/phpBB/includes/ucp/ucp_zebra.php
+++ b/phpBB/includes/ucp/ucp_zebra.php
@@ -114,14 +114,13 @@ class ucp_zebra extends module
 							switch (SQL_LAYER)
 							{
 								case 'mysql':
-								case 'mysql4':
 									$sql = 'INSERT INTO ' . ZEBRA_TABLE . " (user_id, zebra_id, $sql_mode) 
 										VALUES " . implode(', ', preg_replace('#^([0-9]+)$#', '(' . $user->data['user_id'] . ", \\1, 1)",  $user_id_ary));
 									$db->sql_query($sql);
 									break;
 
+								case 'mysql4':
 								case 'mssql':
-								case 'mssql-odbc':
 								case 'sqlite':
 									$sql = 'INSERT INTO ' . ZEBRA_TABLE . " (user_id, zebra_id, $sql_mode) 
 										" . implode(' UNION ALL ', preg_replace('#^([0-9]+)$#', '(' . $user->data['user_id'] . ", \\1, 1)",  $user_id_ary));