Follow-up to bug #10452: Fixed flaws in PATH_INFO check for simulateStaticDocuments

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

diff --git a/ChangeLog b/ChangeLog
index e87704d..e3e8618 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-02-20  Oliver Hader  <oliver@typo3.org>
+
+       * Follow-up to bug #10452: Fixed flaws in PATH_INFO check for simulateStaticDocuments
+
 2009-02-20  Stanislas Rolland  <typo3@sjbr.ca>
 
        * Fixed bug #8905: option+space for inserting non-braking space on Mac OSX does not work properly

diff --git a/typo3/sysext/simulatestatic/class.tx_simulatestatic.php b/typo3/sysext/simulatestatic/class.tx_simulatestatic.php
index 2a99593..2db854d 100644 (file)
--- a/typo3/sysext/simulatestatic/class.tx_simulatestatic.php
+++ b/typo3/sysext/simulatestatic/class.tx_simulatestatic.php
@@ -214,7 +214,7 @@ class tx_simulatestatic {
                }
 
                // If PATH_INFO is defined as simulateStaticDocuments mode and has information:
-               if ($this->conf['mode'] === 'PATH_INFO' && t3lib_div::getIndpEnv('PATH_INFO')) {
+               if (t3lib_div::getIndpEnv('PATH_INFO') && strpos(t3lib_div::getIndpEnv('TYPO3_SITE_SCRIPT'), 'index.php/') === 0) {
                        $parts = t3lib_div::trimExplode('/', t3lib_div::getIndpEnv('PATH_INFO'), true);
                        $pCount = count($parts);
                        if ($pCount > 1) {