From 225ca57d276d92b2d419d4cf2b84173f8212f455 Mon Sep 17 00:00:00 2001
From: Brad Shuttleworth <brad@knowledgetree.com>
Date: Mon, 12 Jun 2006 09:08:07 +0000
Subject: [PATCH] make ::changeWorkflowOnDocument match ::startWorkflowOnDocument in tolerance  

---
 lib/workflow/workflowutil.inc.php | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/lib/workflow/workflowutil.inc.php b/lib/workflow/workflowutil.inc.php
index ad2872d..29bbbd2 100644
--- a/lib/workflow/workflowutil.inc.php
+++ b/lib/workflow/workflowutil.inc.php
@@ -120,9 +120,10 @@ class KTWorkflowUtil {
             
         // fix for 1049: workflows reset on document move.
         // this was the original purpose of "changeWorkflowOnDocument".
-        
-        if ($oDocument->getWorkflowId() == $oWorkflow->getId()) {
-            return true; // bail out, essentially.
+        if (!is_null($oWorkflow)) { 
+            if ($oDocument->getWorkflowId() == $oWorkflow->getId()) {
+                return true; // bail out, essentially.
+            }
         }    
     
         return KTWorkflowUtil::startWorkflowOnDocument($oWorkflow, $oDocument);
@@ -156,12 +157,12 @@ class KTWorkflowUtil {
 
             $oDocument->setWorkflowId($iWorkflowId);
             $oDocument->setWorkflowStateId($iStartStateId);
-
-	    $sTransactionComments = "Workflow \"" . $oWorkflow->getHumanName() . "\" started.";
+	        $sTransactionComments = "Workflow \"" . $oWorkflow->getHumanName() . "\" started.";
+	        
         } else {
             $oDocument->setWorkflowId(null);
             $oDocument->setWorkflowStateId(null);
-	    $sTransactionComments = "Workflow removed from document.";
+	        $sTransactionComments = "Workflow removed from document.";
         }
 
         $res = $oDocument->update();
--
libgit2 0.21.4