From: Stanislas Rolland Date: Sat, 28 Aug 2010 01:05:13 +0000 (+0000) Subject: Fixed bug #15584: htmlArea RTE: iframe baseURL may be incorrectly set X-Git-Tag: TYPO3_4-5-0alpha2~83 X-Git-Url: http://git.typo3.org/Packages/TYPO3.CMS.git/commitdiff_plain/164b7fe36109011bc308426690b0b71d1eb75bbf Fixed bug #15584: htmlArea RTE: iframe baseURL may be incorrectly set git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@8710 709f56b5-9817-0410-a4d7-c38de5d9e867 --- diff --git a/ChangeLog b/ChangeLog index dc19341f82b9..289ef25e3032 100755 --- a/ChangeLog +++ b/ChangeLog @@ -12,6 +12,7 @@ * Fixed bug #15570: htmlArea RTE: Incorrect height when loaded in a hidden tab with ExtJS 3.2.1 * Fixed bug #15415: htmlArea RTE: RTEs hidden on load not usable with multiple RTEs in a record * Fixed bug #15328: htmlArea RTE: Strange behaviours inserting links in IE + * Fixed bug #15584: htmlArea RTE: iframe baseURL may be incorrectly set 2010-08-26 Ingo Renner diff --git a/typo3/sysext/rtehtmlarea/ChangeLog b/typo3/sysext/rtehtmlarea/ChangeLog index a8d06ffab901..bb32cbc5688d 100644 --- a/typo3/sysext/rtehtmlarea/ChangeLog +++ b/typo3/sysext/rtehtmlarea/ChangeLog @@ -4,6 +4,7 @@ * Fixed bug #15570: htmlArea RTE: Incorrect height when loaded in a hidden tab with ExtJS 3.2.1 * Fixed bug #15415: htmlArea RTE: RTEs hidden on load not usable with multiple RTEs in a record * Fixed bug #15328: htmlArea RTE: Strange behaviours inserting links in IE + * Fixed bug #15584: htmlArea RTE: iframe baseURL may be incorrectly set 2010-08-26 Stanislas Rolland diff --git a/typo3/sysext/rtehtmlarea/htmlarea/htmlarea.js b/typo3/sysext/rtehtmlarea/htmlarea/htmlarea.js index f3f3d3e89ff0..5f7676d25721 100644 --- a/typo3/sysext/rtehtmlarea/htmlarea/htmlarea.js +++ b/typo3/sysext/rtehtmlarea/htmlarea/htmlarea.js @@ -118,10 +118,10 @@ HTMLArea.Config = function (editorId) { this.htmlRemoveComments = false; // custom tags (these have to be a regexp, or null if this functionality is not desired) this.customTags = null; - // BaseURL included in the iframe document + // BaseURL to be included in the iframe document this.baseURL = document.baseURI || document.URL; - if (this.baseURL && this.baseURL.match(/(.*)\/([^\/]+)/)) { - this.baseURL = RegExp.$1 + "/"; + if (this.baseURL && this.baseURL.match(/(.*\:\/\/.*\/)[^\/]*/)) { + this.baseURL = RegExp.$1; } // URL-s this.popupURL = "popups/";