Fixed bug #15749: htmlArea RTE: Firefox shows & in external links with query...

git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@8894 709f56b5-9817-0410-a4d7-c38de5d9e867

diff --git a/ChangeLog b/ChangeLog
index 38c693c..483fdd2 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@
        * Fixed bug #15430: htmlArea RTE: Text not editable after pasting with server-based cleaning
        * Follow-up to bug #15430: htmlArea RTE: Text not editable after pasting with server-based cleaning
        * Fixed bug #15797: htmlArea RTE: Problem in Firefox inserting non-breaking space with Insert Special Character dialogue
+       * Fixed bug #15749: htmlArea RTE: Firefox shows & in external links with query string
 
 2010-09-25  Steffen Gebert  <steffen@steffen-gebert.de>
 

diff --git a/typo3/sysext/rtehtmlarea/ChangeLog b/typo3/sysext/rtehtmlarea/ChangeLog
index 65f2c7d..82795c5 100644 (file)
--- a/typo3/sysext/rtehtmlarea/ChangeLog
+++ b/typo3/sysext/rtehtmlarea/ChangeLog
@@ -3,6 +3,7 @@
        * Fixed bug #15430: htmlArea RTE: Text not editable after pasting with server-based cleaning
        * Follow-up to bug #15430: htmlArea RTE: Text not editable after pasting with server-based cleaning
        * Fixed bug #15797: htmlArea RTE: Problem in Firefox inserting non-breaking space with Insert Special Character dialogue
+       * Fixed bug #15749: htmlArea RTE: Firefox shows & in external links with query string
 
 2010-09-12  Stanislas Rolland  <typo3@sjbr.ca>
 

diff --git a/typo3/sysext/rtehtmlarea/mod3/class.tx_rtehtmlarea_browse_links.php b/typo3/sysext/rtehtmlarea/mod3/class.tx_rtehtmlarea_browse_links.php
index 40e2d5e..88580f6 100644 (file)
--- a/typo3/sysext/rtehtmlarea/mod3/class.tx_rtehtmlarea_browse_links.php
+++ b/typo3/sysext/rtehtmlarea/mod3/class.tx_rtehtmlarea_browse_links.php
@@ -245,7 +245,8 @@ class tx_rtehtmlarea_browse_links extends browse_links {
                        // CurrentUrl - the current link url must be passed around if it exists
                $this->curUrlArray = t3lib_div::_GP('curUrl');
                if ($this->curUrlArray['all'])  {
-                       $this->curUrlArray=t3lib_div::get_tag_attributes($this->curUrlArray['all']);
+                       $this->curUrlArray = t3lib_div::get_tag_attributes($this->curUrlArray['all']);
+                       $this->curUrlArray['href'] = htmlspecialchars_decode($this->curUrlArray['href']);
                }
                        // Note: parseCurUrl will invoke the hooks
                $this->curUrlInfo = $this->parseCurUrl($this->curUrlArray['href'],$this->siteURL);