Follow-up to #12336: Little Flaws with MediaCE

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

diff --git a/ChangeLog b/ChangeLog
index ac19697..a8f1fb3 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-10-27  Steffen Kamper  <info@sk-typo3.de>
+
+       * Follow-up to #12336: Little Flaws with MediaCE
+
 2009-10-29  Francois Suter  <francois@typo3.org>
 
        * Fixed bug #12381: Scheduler: Changed TEXT fields to BLOBS for storing serialized data (thanks to Michael Klapper)

diff --git a/typo3/sysext/cms/tslib/class.tslib_content.php b/typo3/sysext/cms/tslib/class.tslib_content.php
index 9dfa68f..0c69b69 100644 (file)
--- a/typo3/sysext/cms/tslib/class.tslib_content.php
+++ b/typo3/sysext/cms/tslib/class.tslib_content.php
@@ -2664,8 +2664,7 @@ class tslib_cObj {
                        $url = $this->stdWrap($conf['file'], $conf['file.']);
                }
 
-               $url = rawurldecode($url);
-
+               $url = $this->typoLink_URL(array('parameter' => $url));
                $mode = is_file(PATH_site . $url) ? 'file' : 'url';
                if ($mode === 'file') {
                        $filename = $GLOBALS['TSFE']->tmpl->getFileName($url);
@@ -2834,7 +2833,7 @@ class tslib_cObj {
                $installUrl = $conf['installUrl'] ? $conf['installUrl'] : $prefix . 'typo3/contrib/flashmedia/swfobject/expressInstall.swf';
                $filename = $this->stdWrap($conf['file'], $conf['file.']);
                if ($filename) {
-                       if (strpos($filename, '://') !== FALSE) {
+                       if (strpos($filename, rawurlencode('://')) !== FALSE) {
                                $conf['flashvars.']['file'] = $filename;
                        } else {
                                if ($prefix) {