diff --git a/presentation/lookAndFeel/knowledgeTree/documentmanagement/addDocumentBL.php b/presentation/lookAndFeel/knowledgeTree/documentmanagement/addDocumentBL.php
index 69c9133..a57a0a6 100644
--- a/presentation/lookAndFeel/knowledgeTree/documentmanagement/addDocumentBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/documentmanagement/addDocumentBL.php
@@ -19,7 +19,7 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
@@ -50,7 +50,8 @@ if (checkSession()) {
     require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/store.inc");
 
     if (isset($fFolderID)) {
-        if (Permission::userHasFolderWritePermission($fFolderID)) {
+    	$oFolder = Folder::get($fFolderID);
+        if (Permission::userHasFolderWritePermission($oFolder)) {
             //user has permission to add document to this folder
             if (isset($fStore)) {
                 // check that a document type has been selected
diff --git a/presentation/lookAndFeel/knowledgeTree/documentmanagement/addDocumentUI.inc b/presentation/lookAndFeel/knowledgeTree/documentmanagement/addDocumentUI.inc
index 43491c8..bf54440 100644
--- a/presentation/lookAndFeel/knowledgeTree/documentmanagement/addDocumentUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/documentmanagement/addDocumentUI.inc
@@ -181,7 +181,8 @@ function getPage($iFolderID, $iDocumentTypeID, $iDependantDocumentID = null, $sM
 		
 	} else {
 		// only allow document type choosing if the user has write permission
-		if (Permission::userHasFolderWritePermission($iFolderID)) {
+		$oFolder = Folder::get($iFolderID);
+		if (Permission::userHasFolderWritePermission($oFolder)) {
 			$sToRender .= getDocumentType($iFolderID, $iDocumentTypeID, $iDependantDocumentID);
 			$sActionButtons .= generateControllerLink("browse", "fFolderID=$iFolderID", "<img src=\"$default->graphicsUrl/widgets/cancel.gif\" border=\"0\"/>");
 			$sActionButtons .= "<input type=\"image\" src=\"$default->graphicsUrl/widgets/next.gif\" border=\"0\"/>";			
diff --git a/presentation/lookAndFeel/knowledgeTree/foldermanagement/addFolderCollaborationBL.php b/presentation/lookAndFeel/knowledgeTree/foldermanagement/addFolderCollaborationBL.php
index 7776d92..229318b 100644
--- a/presentation/lookAndFeel/knowledgeTree/foldermanagement/addFolderCollaborationBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/foldermanagement/addFolderCollaborationBL.php
@@ -33,12 +33,13 @@ require_once("../../../../config/dmsDefaults.php");
 
 if (checkSession()) {
 	if (isset($fFolderID)) {
+		$oFolder = Folder::get($fFolderID);
 		//if a folder has been selected
 		include_once("$default->fileSystemRoot/lib/foldermanagement/Folder.inc");
 		include_once("$default->fileSystemRoot/lib/security/Permission.inc");
         include_once("$default->fileSystemRoot/lib/users/User.inc");
         require_once("$default->fileSystemRoot/presentation/Html.inc");
-		if (Permission::userHasFolderWritePermission($fFolderID)) {
+		if (Permission::userHasFolderWritePermission($oFolder)) {
 			//can only create new collaboration steps if the user has folder write permission
 			if (isset($fForStore)) {
 				//attempt to create the new folder collaboration entry
diff --git a/presentation/lookAndFeel/knowledgeTree/foldermanagement/addFolderDocTypeBL.php b/presentation/lookAndFeel/knowledgeTree/foldermanagement/addFolderDocTypeBL.php
index 28bd441..1fdd1bf 100644
--- a/presentation/lookAndFeel/knowledgeTree/foldermanagement/addFolderDocTypeBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/foldermanagement/addFolderDocTypeBL.php
@@ -36,8 +36,8 @@ if (checkSession()) {
     require_once("addFolderDocTypeUI.inc");
 	
 	$oPatternCustom = & new PatternCustom();
-	
-	if (Permission::userHasFolderWritePermission($fFolderID)) {
+	$oFolder = Folder::get($fFolderID);
+	if (Permission::userHasFolderWritePermission($oFolder)) {
 		if (isset($fForAdd)) {
 			//user has selected a document type
 			if (Folder::folderIsLinkedToDocType($fFolderID, $fDocumentTypeID)) {
diff --git a/presentation/lookAndFeel/knowledgeTree/foldermanagement/addGroupFolderLinkBL.php b/presentation/lookAndFeel/knowledgeTree/foldermanagement/addGroupFolderLinkBL.php
index 19660ac..889b3aa 100644
--- a/presentation/lookAndFeel/knowledgeTree/foldermanagement/addGroupFolderLinkBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/foldermanagement/addGroupFolderLinkBL.php
@@ -43,8 +43,9 @@ if (checkSession()) {
 	if (isset($fFolderID)) {
         $oPatternCustom = & new PatternCustom();
         $oPatternCustom->setHtml("");
+        $oFolder = Folder::get($fFolderID);
 		// if a folder has been selected
-		if (Permission::userHasFolderWritePermission($fFolderID)) {
+		if (Permission::userHasFolderWritePermission($oFolder)) {
 			// can only add access if the user has folder write permission
 			if (isset($fForStore)) {
 				// attempt to create the new folder access entry				
diff --git a/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteDependantDocumentBL.php b/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteDependantDocumentBL.php
index a3053dd..3467f9b 100644
--- a/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteDependantDocumentBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteDependantDocumentBL.php
@@ -43,8 +43,8 @@ if (checkSession()) {
 		require_once("$default->fileSystemRoot/lib/visualpatterns/PatternListBox.inc");
 		require_once("deleteDependantDocumentUI.inc");	
 	
-	
-		if (Permission::userHasFolderWritePermission($fFolderID)) {
+	 	$oFolder = Folder::get($fFolderID);
+		if (Permission::userHasFolderWritePermission($oFolder)) {
 			//user has permission to alter folder contents
 			if (isset($fForDelete)) {
 				$oDependantDocumentTemplate = DependantDocumentTemplate::get($fDependantDocumentTemplateID);
diff --git a/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteFolderBL.php b/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteFolderBL.php
index 2b029ed..a20f270 100644
--- a/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteFolderBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteFolderBL.php
@@ -46,10 +46,11 @@ if (checkSession()) {
     $oPatternCustom = & new PatternCustom();
     
 	if (isset($fFolderID)) {
-		if (Permission::userHasFolderWritePermission($fFolderID)) {
+		$oFolder = Folder::get($fFolderID);
+		if (Permission::userHasFolderWritePermission($oFolder)) {
 			if (isset($fDeleteConfirmed)) {
 				// deletion of folder is confirmed
-				$oFolder = Folder::get($fFolderID);
+				
 				if (isset($oFolder)) {
                     // check if there are any documents or folders in this folder
                     
diff --git a/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteFolderCollaborationBL.php b/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteFolderCollaborationBL.php
index f9b84b6..c4e290c 100644
--- a/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteFolderCollaborationBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteFolderCollaborationBL.php
@@ -41,7 +41,9 @@ if (checkSession()) {
         include_once("$default->fileSystemRoot/lib/groups/Group.inc");
         include_once("$default->fileSystemRoot/lib/roles/Role.inc");
         require_once("$default->fileSystemRoot/presentation/Html.inc");
-        if (Permission::userHasFolderWritePermission($fFolderID)) {
+        
+        $oFolder = Folder::get($fFolderID);
+        if (Permission::userHasFolderWritePermission($oFolder)) {
             //can only delete new collaboration steps if the user has folder write permission
             if (isset($fForDelete)) {
                 $oFolderCollaboration = & FolderCollaboration::get($fFolderCollaborationID);
diff --git a/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteFolderDocTypeBL.php b/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteFolderDocTypeBL.php
index e7fd910..89012af 100644
--- a/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteFolderDocTypeBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteFolderDocTypeBL.php
@@ -38,7 +38,8 @@ if (checkSession()) {
 	
 	$oPatternCustom = & new PatternCustom();
 	
-	if (Permission::userHasFolderWritePermission($fFolderID)) {
+	$oFolder = Folder::get($fFolderID);
+	if (Permission::userHasFolderWritePermission($oFolder)) {
 		//user has permission to delete
 		if (isset($fFolderDocTypeID)) {
 			//the required variables exist
diff --git a/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteGroupFolderLinkBL.php b/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteGroupFolderLinkBL.php
index 3cf30be..2a82a4c 100644
--- a/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteGroupFolderLinkBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteGroupFolderLinkBL.php
@@ -46,8 +46,10 @@ if (checkSession()) {
     if (isset($fFolderID) && isset($fGroupFolderLinkID)) {
         // if a folder has been selected
         $oPatternCustom = & new PatternCustom();
-        $oPatternCustom->setHtml("");        
-        if (Permission::userHasFolderWritePermission($fFolderID)) {
+        $oPatternCustom->setHtml("");    
+           
+		$oFolder = Folder::get($fFolderID);
+        if (Permission::userHasFolderWritePermission($oFolder)) {
             // can only delete group folder links if the user has folder write permission
             if (isset($fForDelete)) {
                 $oGroupFolderLink = & GroupFolderLink::get($fGroupFolderLinkID);
diff --git a/presentation/lookAndFeel/knowledgeTree/foldermanagement/editGroupFolderLinkBL.php b/presentation/lookAndFeel/knowledgeTree/foldermanagement/editGroupFolderLinkBL.php
index 9fc23f9..098630b 100644
--- a/presentation/lookAndFeel/knowledgeTree/foldermanagement/editGroupFolderLinkBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/foldermanagement/editGroupFolderLinkBL.php
@@ -47,8 +47,10 @@ if (checkSession()) {
     if (isset($fFolderID) && isset($fGroupFolderLinkID)) {
         // if a folder has been selected
         $oPatternCustom = & new PatternCustom();
-        $oPatternCustom->setHtml("");        
-        if (Permission::userHasFolderWritePermission($fFolderID)) {
+        $oPatternCustom->setHtml("");     
+        
+        $oFolder = Folder::get($fFolderID); 
+        if (Permission::userHasFolderWritePermission($oFolder)) {
             // can only edit group folder links if the user has folder write permission
             if (isset($fForStore)) {
                 $oGroupFolderLink = & GroupFolderLink::get($fGroupFolderLinkID);
diff --git a/presentation/lookAndFeel/knowledgeTree/foldermanagement/viewDependantDocumentsBL.php b/presentation/lookAndFeel/knowledgeTree/foldermanagement/viewDependantDocumentsBL.php
index 9f50ee7..cd303b9 100644
--- a/presentation/lookAndFeel/knowledgeTree/foldermanagement/viewDependantDocumentsBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/foldermanagement/viewDependantDocumentsBL.php
@@ -47,8 +47,8 @@ if (checkSession()) {
 		require_once("$default->fileSystemRoot/lib/visualpatterns/PatternListBox.inc");
 		require_once("viewDependantDocumentsUI.inc");	
 	
-	
-		if (Permission::userHasFolderWritePermission($fFolderID)) {
+		$oFolder = Folder::get($fFolderID);
+		if (Permission::userHasFolderWritePermission($oFolder)) {
 			//user has folder write permission
 			if (isset($fForStore)) {				
 				$oDependantDocumentTemplate;