Index: branches/5.1.x/core/editor/fckutils.cfm =================================================================== diff -u -N -r12127 -r13141 --- branches/5.1.x/core/editor/fckutils.cfm (.../fckutils.cfm) (revision 12127) +++ branches/5.1.x/core/editor/fckutils.cfm (.../fckutils.cfm) (revision 13141) @@ -44,7 +44,7 @@ else if( find( "gecko/", sAgent ) ) { // try to extract Gecko version date - stResult = reFind( "gecko/(200[3-9][0-1][0-9][0-3][0-9])", sAgent, 1, true ); + stResult = reFind( "gecko/(20[0-9][0-9][0-1][0-9][0-3][0-9])", sAgent, 1, true ); if( arrayLen( stResult.pos ) eq 2 ) { // get Gecko build (i18n date) Index: branches/5.1.x/core/admin_templates/js/forms.js =================================================================== diff -u -N -r12657 -r13141 --- branches/5.1.x/core/admin_templates/js/forms.js (.../forms.js) (revision 12657) +++ branches/5.1.x/core/admin_templates/js/forms.js (.../forms.js) (revision 13141) @@ -64,7 +64,13 @@ for (var i = 0; i < iframes.length; i++) { if (iframes[i].id.match(/___Frame$/) && iframes[i].getAttribute('latesrc')) { - iframes[i].contentWindow.location = iframes[i].getAttribute('latesrc'); + var $iframe = iframes[i]; + + setTimeout( + function () { + LoadFCKEditor($iframe); + }, 0 + ); } } @@ -74,6 +80,10 @@ } } +function LoadFCKEditor($iframe) { + $iframe.contentWindow.location = $iframe.getAttribute('latesrc'); +} + function Form() {} Form = new Form();