Merge branch 'edge' of github.com:ktgit/knowledgetree into edge

Prince Mbekwa
2 parents 2654c50d ccb0e62a
Showing 3 changed files with 4 additions and 1 deletions
plugins/multiselect/BulkImport.php
plugins/multiselect/BulkUpload.php
thirdpartyjs/jquery/jquery_noconflict.js
@@ -65,11 +65,12 @@ class InetBulkImportFolderMultiSelectAction extends KTFolderAction {
 			$js .= "<script src='plugins/multiselect/js/hidelink.js' type='text/javascript'></script>";
  
 			$aJavascript[] = 'thirdpartyjs/jquery/jquery-1.3.2.js';
+			$aJavascript[] = 'thirdpartyjs/jquery/jquery_noconflict.js';
+			
 			$oPage =& $GLOBALS['main'];			
 			if (method_exists($oPage, 'requireJSResources')) {
 				$oPage->requireJSResources($aJavascript);
 			}
-			
 	        return $js._kt('Import from Server Location');
 		}
 		else
@@ -67,6 +67,7 @@ class InetBulkUploadFolderAction extends KTFolderAction {
 		if(!KTPluginUtil::pluginIsActive('inet.foldermetadata.plugin'))
 		{
 			$aJavascript[] = 'thirdpartyjs/jquery/jquery-1.3.2.js';
+			$aJavascript[] = 'thirdpartyjs/jquery/jquery_noconflict.js';
  
 			$oPage =& $GLOBALS['main'];			
 			if (method_exists($oPage, 'requireJSResources')) {
+jQuery.noConflict();