Commit 255d33792f417b685c6a0316245281dc196362bb

Authored by Michael Joseph
1 parent c63fe71e

added documentID to FolderUserRole retrieval from folder collaboration id


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@1460 c91229c3-7414-0410-bfa2-8a42b809f60b
lib/foldermanagement/FolderUserRole.inc
@@ -198,10 +198,10 @@ class FolderUserRole { @@ -198,10 +198,10 @@ class FolderUserRole {
198 return false; 198 return false;
199 } 199 }
200 200
201 - function & getFromFolderCollaboration($iFolderCollaborationID) { 201 + function & getFromFolderCollaboration($iFolderCollaborationID, $iDocumentID) {
202 global $default, $lang_err_database; 202 global $default, $lang_err_database;
203 $sql = $default->db; 203 $sql = $default->db;
204 - $sql->query("SELECT id FROM $default->owl_folders_user_roles_table WHERE group_folder_approval_id = $iFolderCollaborationID"); 204 + $sql->query("SELECT id FROM $default->owl_folders_user_roles_table WHERE group_folder_approval_id = $iFolderCollaborationID AND document_id = $iDocumentID");
205 if ($sql->next_record()) { 205 if ($sql->next_record()) {
206 return FolderUserRole::get($sql->f("id")); 206 return FolderUserRole::get($sql->f("id"));
207 } 207 }