--- user.module~	2006-08-12 07:04:19.000000000 +0000
+++ user.module	2006-09-01 16:09:33.000000000 +0000
@@ -1791,7 +1791,8 @@
         $form['permission'][$perm] = array('#type' => 'markup', '#value' => t($perm));
         foreach ($role_names as $rid => $name) {
           // Builds arrays for checked boxes for each role
-          if (strstr($role_permissions[$rid], $perm)) {
+          // if (preg_match($role_permissions[$rid], $perm)) {
+          if (preg_match("/(^|,\\s*)$perm(,|$)/", $role_permissions[$rid])) {
             $status[$rid][] = $perm;
           }
         }