diff --git a/javascript/CMSMain_upload.js b/javascript/CMSMain_upload.js index d2d59589..a086add2 100644 --- a/javascript/CMSMain_upload.js +++ b/javascript/CMSMain_upload.js @@ -14,9 +14,7 @@ CMSMain_upload.prototype = { if(pv.major < 9) return; // Due to a bug in the flash plugin on Linux and Mac, we need at least version 9.0.64 to use SWFUpload - if(navigator.appVersion.indexOf("Mac") != -1 || navigator.appVersion.indexOf("X11") != -1 || navigator.appVersion.indexOf("Linux") != -1) { - if(pv.major == 9 && pv.minor == 0 && pv.rev < 64) return; - } + if(pv.major == 9 && pv.minor == 0 && pv.rev < 64) return; // If those 2 checks pass, we can provide upload capabilities to the user this.iframe = window.top.document.getElementById('AssetAdmin_upload'); diff --git a/javascript/TinyMCEImageEnhancement.js b/javascript/TinyMCEImageEnhancement.js index a78d88ae..4182f7d7 100644 --- a/javascript/TinyMCEImageEnhancement.js +++ b/javascript/TinyMCEImageEnhancement.js @@ -123,15 +123,13 @@ TinyMCEImageEnhancement.prototype = { // Due to a bug in the flash plugin on Linux and Mac, //we need at least version 9.0.64 to use SWFUpload // see http://open.silverstripe.com/ticket/3023 - if(navigator.appVersion.indexOf("Mac") != -1 || navigator.appVersion.indexOf("X11") != -1 || navigator.appVersion.indexOf("Linux") != -1) { - pv = getFlashPlayerVersion(); - if(pv.major < 9 || pv.major > 9 || (pv.major == 9 && pv.minor == 0 && pv.rev < 64)) { - if($('AddFolderGroup')) $('AddFolderGroup').style.display = 'none'; - if($('PipeSeparator')) $('PipeSeparator').style.display = 'none'; - if($('UploadGroup')) $('UploadGroup').style.display = 'none'; - return; - } - } + pv = getFlashPlayerVersion(); + if(pv.major < 9 || pv.major > 9 || (pv.major == 9 && pv.minor == 0 && pv.rev < 64)) { + if($('AddFolderGroup')) $('AddFolderGroup').style.display = 'none'; + if($('PipeSeparator')) $('PipeSeparator').style.display = 'none'; + if($('UploadGroup')) $('UploadGroup').style.display = 'none'; + return; + } if($('FolderID') != null) { if($('SecurityID')) var securityid=$('SecurityID').value;