Fix typolink.addQueryString.method=GET and wrong use of implode in typo3/mod/tools...

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

diff --git a/ChangeLog b/ChangeLog
index d334f80..b635306 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+
+2006-04-29  Martin Kutschker  <martin.t.kutschker@blackbox.net>
+
+       Fix typolink.addQueryString.method=GET (see bug #3241)
+
 2006-05-03   Rupert Germann  <rupi@gmx.li>
 
        * Fix: mod.web_list.alternateBgColors=1 did not work in TYPO3 4.0 when no skin is used. Added the missing class to typo3/stylesheet.css
@@ -6,6 +11,10 @@
 
        * Fixed bug #3226: Error in template::clearCacheMenu if user is not admin
 
+2006-04-29  Martin Kutschker  <martin.t.kutschker@blackbox.net>
+
+       * Fixed wrong use of implode in typo3/mod/tools/em/class.em_index.php (lines 1392, 1424)
+
 2006-04-23  Dmitry Dulepov <typo3@accio.lv>
 
        * Fixed bugs #3049 and #3176: HTTP status 503 is sent when $TSFE->set_no_cache is called

diff --git a/typo3/mod/tools/em/class.em_index.php b/typo3/mod/tools/em/class.em_index.php
index e70c418..b00f264 100644 (file)
--- a/typo3/mod/tools/em/class.em_index.php
+++ b/typo3/mod/tools/em/class.em_index.php
@@ -1389,7 +1389,7 @@ EXTENSION KEYS:
                                        $content = '<p>The mirror list was not updated, it could not be fetched from '.$this->MOD_SETTINGS['mirrorListURL'].'. Possible reasons: network problems, allow_url_fopen is off, curl is not enabled in Install tool.</p>';
                                } else {
                                        t3lib_div::writeFile($mfile, $mirrorsFile);
-                                       $mirrors = implode(gzfile($mfile));
+                                       $mirrors = implode('',gzfile($mfile));
                                        t3lib_div::unlink_tempfile($mfile);
 
                                        $mirrors = $this->xmlhandler->parseMirrorsXML($mirrors);
@@ -1421,7 +1421,7 @@ EXTENSION KEYS:
                                                $content .= '<p>Error: The extension list could not be fetched from '.$extfile.'. Possible reasons: network problems, allow_url_fopen is off, curl is not enabled in Install tool.</p>';
                                        } else {
                                                t3lib_div::writeFile(PATH_site.'typo3temp/extensions.xml.gz', $extXML);
-                                               $content .= $this->xmlhandler->parseExtensionsXML(implode(gzfile(PATH_site.'typo3temp/extensions.xml.gz')));
+                                               $content .= $this->xmlhandler->parseExtensionsXML(implode('',gzfile(PATH_site.'typo3temp/extensions.xml.gz')));
                                                $this->xmlhandler->saveExtensionsXML();
                                        }
                                }

diff --git a/typo3/sysext/cms/tslib/class.tslib_content.php b/typo3/sysext/cms/tslib/class.tslib_content.php
index 3462198..0f45690 100755 (executable)
--- a/typo3/sysext/cms/tslib/class.tslib_content.php
+++ b/typo3/sysext/cms/tslib/class.tslib_content.php
@@ -5562,9 +5562,14 @@ class tslib_cObj {
                }
 
                $content = '';
-               foreach ($q_out as $k => $v)    {
-                       $content .= '&'.$k.'='.($rawValues ? $v : rawurlencode($v));
+               if ($rawValues) {
+                       foreach ($q_out as $k => $v)    {
+                               $content .= '&'.$k.'='.$v;
+                       }
+               } else {
+                       $content = t3lib_div::implodeArrayForUrl('',$q_out);
                }
+
                return $content;
        }