* Changed version requirements for t3skin (problems in combination with TYPO3...

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

diff --git a/ChangeLog b/ChangeLog
index d7f2bba..7c494f9 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,7 @@
 2006-07-31  Michael Stucki  <michael@typo3.org>
 
        * Updates to NEWS.txt (thanks to Martin Kutschker)
+       * Changed version requirements for t3skin (problems in combination with TYPO3 4.0.1)
 
 2006-07-30  Michael Stucki  <michael@typo3.org>
 

diff --git a/NEWS.txt b/NEWS.txt
index 4304a89..4cad087 100644 (file)
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -38,11 +38,10 @@ Important bugfixes
 
        * Windows systems print phpinfo under some circumstances (bug #3362)
        * HTTP status was incorrect for pageNotFound_handling when external URL is specified as 404 page
+       * Wrong HTTP status 503 was sent when $TSFE->set_no_cache() was called from a plugin (bugs #3049 and #3176)
        * Mail forms did not work with <input type="image"> submit buttons (bug #1374)
        * FE editing: edit form on page did not work in 4.0
-       * Several issues of "text with image" for "CSS styled content" have been resolved
        * Linking images to hidden pages resulted in click-enlarge (bug #3522)
-       * Wrong HTTP status 503 was sent when $TSFE->set_no_cache() was called from a plugin (bugs #3049 and #3176)
        * config.formMailCharset did not work (bug #3600)
        * Some broken references to media/ have been fixed (bug #3233)
        * Fixed RTE bug: images were removed under some special conditions when saving (bug #3051)

diff --git a/typo3/sysext/cms/tslib/class.tslib_fe.php b/typo3/sysext/cms/tslib/class.tslib_fe.php
index a0c9153..14255ab 100755 (executable)
--- a/typo3/sysext/cms/tslib/class.tslib_fe.php
+++ b/typo3/sysext/cms/tslib/class.tslib_fe.php
@@ -1310,7 +1310,7 @@
                                if ($reason == '') {
                                        $reason = 'Page cannot be found.';
                                }
-                               $reason .= chr(10) . chr(10) . 'Additionally ' . $code . ' was not found while trying to retrieve the error document.';
+                               $reason.= chr(10) . chr(10) . 'Additionally, ' . $code . ' was not found while trying to retrieve the error document.';
                                $this->printError('Reason: '.nl2br(htmlspecialchars($reason)));
                                exit();
                        }

diff --git a/typo3/sysext/t3skin/ext_emconf.php b/typo3/sysext/t3skin/ext_emconf.php
index 1145a1c..cfd9daf 100644 (file)
--- a/typo3/sysext/t3skin/ext_emconf.php
+++ b/typo3/sysext/t3skin/ext_emconf.php
@@ -37,7 +37,7 @@ $EM_CONF[$_EXTKEY] = array(
        'constraints' => array(
                'depends' => array(
                        'php' => '4.3.0-5.9.0',
-                       'typo3' => '3.9.0-4.0',
+                       'typo3' => '3.9.0-4.0.999',
                ),
                'conflicts' => array(
                ),