Added hack for #248146 (problems with the upload module in FF2)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 21cf391..b3c9cb4 100644 (file)
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,5 +1,8 @@
 $Id$
 
+-- 2008-12-18 version 6.x-1.x-dev
+* Added hack for #248146 (problems with the upload module in FF2)
+
 -- 2008-12-17 version 6.x-1.x-dev
 * Fixed valdiation of asterisk in the exclude/include settings
 

diff --git a/fckeditor.utils.js b/fckeditor.utils.js
index ec5838c..f40039e 100644 (file)
--- a/fckeditor.utils.js
+++ b/fckeditor.utils.js
@@ -167,6 +167,10 @@ function doFCKeditorSave(){
 
 function DoFCKeditorTeaserStuff()
 {
+  //bad hack for #248146
+  if ($('#ahah-progress-edit-attach').length) {
+    return false;
+  }
     for( var i = 0 ; i < fckLaunchedJsId.length ; i++ ) {
       if ( document.getElementById( fckLaunchedTextareaId[i] ).style.display == 'none' )
       {