Merge pull request #2999 from ElTrolado/release-2.1

Fix PMs permission checking
SimpleMachines · f0bb3b74374ae04fcc27018bbb2be41ccc81ea61 · Aug 22, 2015
commit f0bb3b74374ae04fcc27018bbb2be41ccc81ea61
2 parents 25be8ec + 05b4b36
Unified Split

Showing with 3 additions and 3 deletions.

+3 −3  Sources/Subs-Post.php
@@ -922,10 +922,10 @@ function sendpm($recipients, $subject, $message, $store_outbox = false, $from =
 
 	// Load the groups that are allowed to read PMs.
 	require_once($sourcedir . '/Subs-Members.php');
-	list($allowed_groups, $disallowed_groups) = groupsAllowedTo('pm_read');
+	$pmReadGroups = groupsAllowedTo('pm_read');
 
 	if (empty($modSettings['permission_enable_deny']))
-		$disallowed_groups = array();
+		$pmReadGroups['denied'] = array();
 
 	// Load their alert preferences
 	require_once($sourcedir . '/Subs-Notify.php');
@@ -991,7 +991,7 @@ function sendpm($recipients, $subject, $message, $store_outbox = false, $from =
 			}
 
 			// Do they have any of the allowed groups?
-			if (count(array_intersect($allowed_groups, $groups)) == 0 || count(array_intersect($disallowed_groups, $groups)) != 0)
+			if (count(array_intersect($pmReadGroups['allowed'], $groups)) == 0 || count(array_intersect($pmReadGroups['denied'], $groups)) != 0)
 			{
 				$log['failed'][$row['id_member']] = sprintf($txt['pm_error_user_cannot_read'], $row['real_name']);
 				unset($all_to[array_search($row['id_member'], $all_to)]);