From 8663bd6899e6cd005454634aeb41e6d09f2dfce0 Mon Sep 17 00:00:00 2001
From: kevin_fourie <kevin_fourie@c91229c3-7414-0410-bfa2-8a42b809f60b>
Date: Mon, 5 Mar 2007 13:22:56 +0000
Subject: [PATCH] Merged from trunk...

---
 lib/actions/bulkaction.php           | 6 +++++-
 plugins/ktcore/KTDocumentActions.php | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/lib/actions/bulkaction.php b/lib/actions/bulkaction.php
index fe9ae5c..7325576 100644
--- a/lib/actions/bulkaction.php
+++ b/lib/actions/bulkaction.php
@@ -312,6 +312,10 @@ class KTBulkAction extends KTStandardDispatcher {
         $sAction = 'main';
 
         if($sReturnAction == 'browse') {
+        	if ($sReturnData == '')
+        	{
+        		$sReturnData = KTUtil::arrayGet($_REQUEST, 'fFolderId');
+        	}        	 
             $sTargetUrl = KTBrowseUtil::getUrlForFolder(Folder::get($sReturnData));
         } else if($sReturnAction == 'simpleSearch') {
             $sTargetUrl = KTBrowseUtil::getSimpleSearchBaseUrl();
@@ -497,4 +501,4 @@ class KTBulkActionUtil {
     }
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/plugins/ktcore/KTDocumentActions.php b/plugins/ktcore/KTDocumentActions.php
index f0ea3b1..cab5a24 100644
--- a/plugins/ktcore/KTDocumentActions.php
+++ b/plugins/ktcore/KTDocumentActions.php
@@ -933,7 +933,7 @@ class KTDocumentMoveAction extends KTDocumentAction {
                 $bFileClash = KTDocumentUtil::fileExists($data['browse'], $this->oDocument->getFilename());              
                 if ($bFileClash && isset($data['filename'])) {
                     $filename = $data['filename'];
-                    $bFileClash = KTDocumentUtil::fileExists($this->oFolder, $filename);              
+                    $bFileClash = KTDocumentUtil::fileExists($data['browse'], $filename);              
                 } else {
                     $filename = $this->oDocument->getFilename();
                 }            
@@ -1348,6 +1348,10 @@ class KTDocumentWorkflowAction extends KTDocumentAction {
         if ($aTransitions) {
             $aVocab = array();
             foreach ($aTransitions as $oTransition) {
+            	if(is_null($oTransition) || PEAR::isError($oTransition)){
+            		continue;
+            	}
+
                 $aVocab[$oTransition->getId()] = $oTransition->showDescription();
             }
             $fieldOptions = array('vocab' => $aVocab);
--
libgit2 0.21.4