From adf7de260d00e646fd7cc08c890d507810e41e3e Mon Sep 17 00:00:00 2001
From: Michael Joseph <michael@knowledgetree.com>
Date: Mon, 21 Jul 2003 08:02:07 +0000
Subject: [PATCH] only retrieve the organisation object if there is one mapped to the unit being removed

---
 presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/removeUnitBL.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/removeUnitBL.php b/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/removeUnitBL.php
index ffbdc1f..2594919 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/removeUnitBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/removeUnitBL.php
@@ -37,6 +37,9 @@ if (checkSession()) {
 	        } else {
 		        // retrieve organisation link (for later deletion or to get the organisation id)
 			    $oUnitOrg = UnitOrganisationLink::getByUnitID($fUnitID);
+			    if ($oUnitOrg) {
+			    	$oOrganisation = Organisation::get($oUnitOrg->getOrgID());
+			    }			    
 	        		
 				// we've received confirmation, so delete
 			    if (isset($fForDeleteConfirmed)) {
@@ -59,7 +62,6 @@ if (checkSession()) {
 			        }
 	        	// ask for confirmation before deleting		        
 			    } else {
-			    	$oOrganisation = Organisation::get($oUnitOrg->getOrgID());
 			        $oPatternCustom->setHtml(getConfirmDeletePage($oUnit, $oOrganisation));
 			        $main->setFormAction($_SERVER["PHP_SELF"] . "?fForDeleteConfirmed=1");
 			    }
--
libgit2 0.21.4