Follow-up for issue #9185: Incorrect initialization when hooks are present

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

diff --git a/ChangeLog b/ChangeLog
index 0f71aea..7c11d07 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-08-19  Stanislas Rolland  <typo3@sjbr.ca>
+
+       * Follow-up for issue #9185: Incorrect initialization when hooks are present
+
 2008-08-18  Stanislas Rolland  <typo3@sjbr.ca>
 
        * Follow-up for feature #4686: htmlArea RTE Spell Checker: add u modifier to preg_* operations

diff --git a/typo3/sysext/rtehtmlarea/ChangeLog b/typo3/sysext/rtehtmlarea/ChangeLog
index 66ef81d..9a9afc8 100644 (file)
--- a/typo3/sysext/rtehtmlarea/ChangeLog
+++ b/typo3/sysext/rtehtmlarea/ChangeLog
@@ -1,3 +1,7 @@
+2008-08-19  Stanislas Rolland  <typo3@sjbr.ca>
+
+       * Follow-up for issue #9185: Incorrect initialization when hooks are present
+
 2008-08-18  Stanislas Rolland  <typo3@sjbr.ca>
 
        * Follow-up for feature #4686: htmlArea RTE Spell Checker: add u modifier to preg_* operations

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 0f5af34..36a02d3 100644 (file)
--- a/typo3/sysext/rtehtmlarea/mod3/class.tx_rtehtmlarea_browse_links.php
+++ b/typo3/sysext/rtehtmlarea/mod3/class.tx_rtehtmlarea_browse_links.php
@@ -221,11 +221,25 @@ class tx_rtehtmlarea_browse_links extends browse_links {
         */
        function init() {
                global $BACK_PATH,$LANG,$TYPO3_CONF_VARS;
-               
+
                $this->initVariables();
                $this->initConfiguration();
                $this->initHookObjects('ext/rtehtmlarea/mod3/class.tx_rtehtmlarea_browse_links.php');
 
+                       // 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']);
+               }
+                       // Note: parseCurUrl will invoke the hooks
+               $this->curUrlInfo = $this->parseCurUrl($this->curUrlArray['href'],$this->siteURL);
+
+                       // Determine nature of current url:
+               $this->act = t3lib_div::_GP('act');
+               if (!$this->act)        {
+                       $this->act=$this->curUrlInfo['act'];
+               }
+
                        // Initializing the title value
                $this->setTitle = $LANG->csConvObj->conv($this->curUrlArray['title'], 'utf-8', $LANG->charSet);
 
@@ -497,20 +511,6 @@ class tx_rtehtmlarea_browse_links extends browse_links {
                
                        // the script to link to
                $this->thisScript = t3lib_div::getIndpEnv('SCRIPT_NAME');
-               
-                       // 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['href'] = utf8_decode($this->curUrlArray['href']);
-               $this->curUrlInfo = $this->parseCurUrl($this->curUrlArray['href'],$this->siteURL);
-               
-                       // Determine nature of current url:
-               $this->act = t3lib_div::_GP('act');
-               if (!$this->act)        {
-                       $this->act=$this->curUrlInfo['act'];
-               }
        }
        
        /**