From bc90ced45c2efa53008112175f4150006b641cf6 Mon Sep 17 00:00:00 2001
From: kevin_fourie <kevin_fourie@c91229c3-7414-0410-bfa2-8a42b809f60b>
Date: Thu, 27 Mar 2008 17:10:47 +0000
Subject: [PATCH] Merged in from DEV trunk...

---
 plugins/ktstandard/KTDocumentLinks.php | 28 +++++++++++++++++-----------
 plugins/search2/MigrationDashlet.php   |  5 ++++-
 2 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/plugins/ktstandard/KTDocumentLinks.php b/plugins/ktstandard/KTDocumentLinks.php
index 6486475..fa2f3f7 100644
--- a/plugins/ktstandard/KTDocumentLinks.php
+++ b/plugins/ktstandard/KTDocumentLinks.php
@@ -288,18 +288,20 @@ class KTDocumentLinkAction extends KTDocumentAction {
 
     // select a type for the link
     function do_type_select() {
-        
+
         //Checking to see if the document is being linked to itself and returning an error if it is.
         $iTempParentDocId = $_REQUEST['fDocumentId'];
         $aTempDocuments = $_REQUEST['linkselection'];
-        foreach ($aTempDocuments as $iTempDocId)
-        {
-	        if($iTempParentDocId == $iTempDocId)
-	        {
-	        	$this->errorRedirectToMain(_kt('A document cannot be linked to itself.'));
-	        }
+        if(!empty($aTempDocuments)){
+            foreach ($aTempDocuments as $iTempDocId)
+            {
+    	        if($iTempParentDocId == $iTempDocId)
+    	        {
+    	        	$this->errorRedirectToMain(_kt('A document cannot be linked to itself.'));
+    	        }
+            }
         }
-        
+
         $this->oPage->setBreadcrumbDetails(_kt("link"));
 
         $sType = (isset($_REQUEST['linktype'])) ? $_REQUEST['linktype'] : 'internal';
@@ -331,7 +333,8 @@ class KTDocumentLinkAction extends KTDocumentAction {
         $aFields = array();
 
         $aVocab = array();
-        foreach(LinkType::getList("id > 0") as $oLinkType) {
+        $aLinkTypes = LinkType::getList("id > 0");
+        foreach($aLinkTypes as $oLinkType) {
             $aVocab[$oLinkType->getID()] = $oLinkType->getName();
         }
 
@@ -562,8 +565,11 @@ class KTDocLinkAdminDispatcher extends KTAdminDispatcher {
         foreach ($types_to_delete as $link_id) {
             $oLinkType = LinkType::get($link_id);
 
-            foreach(DocumentLink::getList(sprintf("link_type_id = %d", $link_id)) as $oLink) {
-                $oLink->delete();
+            $aLinks = DocumentLink::getList(sprintf("link_type_id = %d", $link_id));
+            if(!empty($aLinks)){
+                foreach($aLinks as $oLink) {
+                    $oLink->delete();
+                }
             }
 
             $oLinkType->delete(); // technically, this is a bad thing
diff --git a/plugins/search2/MigrationDashlet.php b/plugins/search2/MigrationDashlet.php
index e88ee09..d9ee653 100644
--- a/plugins/search2/MigrationDashlet.php
+++ b/plugins/search2/MigrationDashlet.php
@@ -87,7 +87,10 @@ class LuceneMigrationDashlet extends KTBaseDashlet
 			$migrationStartString = date('Y-m-d H:i:s', $migrationStart);
 			$migrationTime = KTUtil::getSystemSetting('migrationTime',0);
 			$migrationPeriod = KTUtil::computePeriod($migrationTime, '');
-			$timePerDocument = $migrationTime / ($migratedDocuments > 0) ? $migratedDocuments : 1;
+
+			// Cannot divide by zero so make it 1
+			$divMigratedDocuments = ($migratedDocuments > 0) ? $migratedDocuments : 1;
+			$timePerDocument = $migrationTime / $divMigratedDocuments;
 			$estimatedPeriod = $timePerDocument * $migratingDocuments;
 			$estimatedTime = date('Y-m-d H:i:s', $migrationStart + $estimatedPeriod);
 			$estimatedPeriod = KTUtil::computePeriod($estimatedPeriod, '');
--
libgit2 0.21.4