Index: trunk/admin/users/user_addpermission.php
===================================================================
diff -u -r374 -r402
--- trunk/admin/users/user_addpermission.php	(.../user_addpermission.php)	(revision 374)
+++ trunk/admin/users/user_addpermission.php	(.../user_addpermission.php)	(revision 402)
@@ -174,7 +174,7 @@
 
     $ado = GetADODBConnection();
     $sql = "SELECT * FROM ".GetTablePrefix()."PermissionConfig AS pc LEFT JOIN ".GetTablePrefix()."Phrase AS p ON pc.Description = p.Phrase WHERE pc.ModuleId='$PermModule' AND p.LanguageId = ".$objSession->Get("Language")." ORDER BY p.Translation ASC";
-//echo $sql;
+
     if($objSession->HasSystemPermission("DEBUG.LIST"))
       echo htmlentities($sql,ENT_NOQUOTES)."<br>\n";
 
@@ -187,12 +187,17 @@
       echo "<TD><IMG src=\"".$imagesURL."/itemicons/icon16_permission.gif\"> ";
       echo prompt_language($desc)."</TD>";
       $checked = "";
+      
       if($UserGroupExists)
 	  {
+	  	//echo "GroupPermission on $Permission: ".$UserGroup->HasSystemPermission($Permission)."<br>";
+	  	//echo "UserPermission on $Permission: ".$c->HasSystemPermission($Permission)."<br>";
 	    $Inherit = ($UserGroup->HasSystemPermission($Permission)==-1);
 	  }
-	  else
+	  else {
 	    $Inherit =TRUE;
+	  }
+	
       if($Inherit)
       {
         $checked = " CHECKED";