From 4c9c1962d772372166475304e384f7bb61a1d5c5 Mon Sep 17 00:00:00 2001
From: Paul Barrett <paul@knowledgetree.com>
Date: Wed, 27 Jan 2010 16:15:56 +0200
Subject: [PATCH] Fix ordering of folder actions when Multi-select plugin enabled

---
 plugins/multiselect/BulkImport.php        | 2 +-
 plugins/multiselect/BulkUpload.php        | 2 +-
 plugins/multiselect/MultiSelectPlugin.php | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/plugins/multiselect/BulkImport.php b/plugins/multiselect/BulkImport.php
index d3985a4..b86bcac 100755
--- a/plugins/multiselect/BulkImport.php
+++ b/plugins/multiselect/BulkImport.php
@@ -71,7 +71,7 @@ class InetBulkImportFolderMultiSelectAction extends KTFolderAction {
 			if (method_exists($oPage, 'requireJSResources')) {
 				$oPage->requireJSResources($aJavascript);
 			}
-	        return $js._kt('Import from Server Location');
+	        return _kt('Import from Server Location') . $js;
 		}
 		else
 		{
diff --git a/plugins/multiselect/BulkUpload.php b/plugins/multiselect/BulkUpload.php
index 11f3f18..e1c51cf 100755
--- a/plugins/multiselect/BulkUpload.php
+++ b/plugins/multiselect/BulkUpload.php
@@ -75,7 +75,7 @@ class InetBulkUploadFolderAction extends KTFolderAction {
 			}
 
 			$js = "<script src='resources/js/kt_hidelink.js' type='text/javascript'></script>";
-			return $js._kt('Bulk Upload');
+			return _kt('Bulk Upload') .$js;
 		}
 		else
 		{
diff --git a/plugins/multiselect/MultiSelectPlugin.php b/plugins/multiselect/MultiSelectPlugin.php
index 2b6f00d..707e9c3 100644
--- a/plugins/multiselect/MultiSelectPlugin.php
+++ b/plugins/multiselect/MultiSelectPlugin.php
@@ -126,6 +126,7 @@ class MultiSelectPlugin extends KTPlugin {
             'InetdocumentFieldsv2.php', null);
 	}
 }
+
 $oPluginRegistry =& KTPluginRegistry::getSingleton();
 $oPluginRegistry->registerPlugin('MultiSelectPlugin', 'inet.multiselect.lookupvalue.plugin', __FILE__);
 ?>
\ No newline at end of file
--
libgit2 0.21.4