Commit ad98dddbe06e64aaec985bbd4aabb3beb91c4af6
Merge branch 'edge' of github.com:ktgit/knowledgetree into edge
Showing
3 changed files
with
4 additions
and
1 deletions
plugins/multiselect/BulkImport.php
| @@ -65,11 +65,12 @@ class InetBulkImportFolderMultiSelectAction extends KTFolderAction { | @@ -65,11 +65,12 @@ class InetBulkImportFolderMultiSelectAction extends KTFolderAction { | ||
| 65 | $js .= "<script src='plugins/multiselect/js/hidelink.js' type='text/javascript'></script>"; | 65 | $js .= "<script src='plugins/multiselect/js/hidelink.js' type='text/javascript'></script>"; |
| 66 | 66 | ||
| 67 | $aJavascript[] = 'thirdpartyjs/jquery/jquery-1.3.2.js'; | 67 | $aJavascript[] = 'thirdpartyjs/jquery/jquery-1.3.2.js'; |
| 68 | + $aJavascript[] = 'thirdpartyjs/jquery/jquery_noconflict.js'; | ||
| 69 | + | ||
| 68 | $oPage =& $GLOBALS['main']; | 70 | $oPage =& $GLOBALS['main']; |
| 69 | if (method_exists($oPage, 'requireJSResources')) { | 71 | if (method_exists($oPage, 'requireJSResources')) { |
| 70 | $oPage->requireJSResources($aJavascript); | 72 | $oPage->requireJSResources($aJavascript); |
| 71 | } | 73 | } |
| 72 | - | ||
| 73 | return $js._kt('Import from Server Location'); | 74 | return $js._kt('Import from Server Location'); |
| 74 | } | 75 | } |
| 75 | else | 76 | else |
plugins/multiselect/BulkUpload.php
| @@ -67,6 +67,7 @@ class InetBulkUploadFolderAction extends KTFolderAction { | @@ -67,6 +67,7 @@ class InetBulkUploadFolderAction extends KTFolderAction { | ||
| 67 | if(!KTPluginUtil::pluginIsActive('inet.foldermetadata.plugin')) | 67 | if(!KTPluginUtil::pluginIsActive('inet.foldermetadata.plugin')) |
| 68 | { | 68 | { |
| 69 | $aJavascript[] = 'thirdpartyjs/jquery/jquery-1.3.2.js'; | 69 | $aJavascript[] = 'thirdpartyjs/jquery/jquery-1.3.2.js'; |
| 70 | + $aJavascript[] = 'thirdpartyjs/jquery/jquery_noconflict.js'; | ||
| 70 | 71 | ||
| 71 | $oPage =& $GLOBALS['main']; | 72 | $oPage =& $GLOBALS['main']; |
| 72 | if (method_exists($oPage, 'requireJSResources')) { | 73 | if (method_exists($oPage, 'requireJSResources')) { |
thirdpartyjs/jquery/jquery_noconflict.js
0 → 100644
| 1 | +jQuery.noConflict(); |