From d6ec0f7096aa71e63cc4364b815af0f3ee13ba99 Mon Sep 17 00:00:00 2001
From: kevin_fourie <kevin_fourie@c91229c3-7414-0410-bfa2-8a42b809f60b>
Date: Thu, 8 May 2008 13:02:58 +0000
Subject: [PATCH] Merged in from DEV trunk...

---
 plugins/ktcore/folder/Permissions.php                    | 3 ++-
 templates/ktcore/folder/resolved_permissions_user.smarty | 5 ++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugins/ktcore/folder/Permissions.php b/plugins/ktcore/folder/Permissions.php
index 17ad3d4..ecdfcf1 100644
--- a/plugins/ktcore/folder/Permissions.php
+++ b/plugins/ktcore/folder/Permissions.php
@@ -218,6 +218,7 @@ class KTFolderPermissionsAction extends KTFolderAction {
 				if ($everyone || ($authenticated && $oUser->isAnonymous()) ||
 					KTPermissionUtil::userHasPermissionOnItem($oUser, $oPermission, $this->oFolder)){
 					$aMapPermissionUser[$iPermissionID][$oUser->getId()] = true;
+					$aActiveUsers[$oUser->getId()] = $oUser->getName();
 				}
              }
         }
@@ -227,7 +228,7 @@ class KTFolderPermissionsAction extends KTFolderAction {
         $groups = array();
         $roles = array(); // should _always_ be empty, barring a bug in permissions::updatePermissionLookup
 
-        $users = $aUsers;
+        $users = $aActiveUsers;
         asort($users); // ascending, per convention.
 
         $bEdit = false;
diff --git a/templates/ktcore/folder/resolved_permissions_user.smarty b/templates/ktcore/folder/resolved_permissions_user.smarty
index b2b12f5..86c1dff 100644
--- a/templates/ktcore/folder/resolved_permissions_user.smarty
+++ b/templates/ktcore/folder/resolved_permissions_user.smarty
@@ -30,9 +30,8 @@ this folder.{/i18n}</p>
 </thead>
 <tbody>
 
-{ foreach item=oUser from=$users }
-<td><span class="descriptiveText">{i18n}User: {/i18n}</span> {$oUser->getName()}</td>
-  { assign var=iUserId value=$oUser->getId() }
+{ foreach item=sUserName key=iUserId from=$users }
+<td><span class="descriptiveText">{i18n}User: {/i18n}</span> {$sUserName}</td>
   { foreach item=oPerm from=$permissions }
     { assign var=iPermId value=$oPerm->getId() }
     { assign var=bHasPerm value=$aMapPermissionUser[$iPermId][$iUserId] }
--
libgit2 0.21.4