[TASK] PATH_thisScript is defined twice in bootstrap
authorAndy Grunwald <andygrunwald@gmail.com>
Mon, 19 Mar 2012 12:46:05 +0000 (13:46 +0100)
committerChristian Kuhn <lolli@schwarzbu.ch>
Wed, 11 Apr 2012 12:06:52 +0000 (14:06 +0200)
In index.php AND typo3/sysext/cms/tslib/index_ts.php
(which will be included in index.php) the constant
PATH_thisScript is defined.

The definition in typo3/sysext/cms/tslib/index_ts.php
is obsolete, because this will be checked via
if(!defined(...)).

Change-Id: I3ffc0639d61f76bb6c72a96fb4fd2908e38a0268
Fixes: #35003
Releases: 6.0, 4.7
Reviewed-on: http://review.typo3.org/9739
Reviewed-by: Andy Grunwald
Tested-by: Andy Grunwald
Reviewed-by: Christian Kuhn
Tested-by: Christian Kuhn
typo3/sysext/cms/tslib/index_ts.php

index fa97fe8..b21a78c 100644 (file)
@@ -55,14 +55,6 @@ $TYPO3_MISC['microtime_start'] = microtime(TRUE);
 define('TYPO3_OS', stristr(PHP_OS,'win')&&!stristr(PHP_OS,'darwin')?'WIN':'');
 define('TYPO3_MODE','FE');
 
-if(!defined('PATH_thisScript')) {
-       define('PATH_thisScript', str_replace('//', '/', str_replace('\\', '/',
-               (PHP_SAPI == 'fpm-fcgi' || PHP_SAPI == 'cgi' || PHP_SAPI == 'isapi' || PHP_SAPI == 'cgi-fcgi') &&
-               ($_SERVER['ORIG_PATH_TRANSLATED'] ? $_SERVER['ORIG_PATH_TRANSLATED'] : $_SERVER['PATH_TRANSLATED']) ?
-               ($_SERVER['ORIG_PATH_TRANSLATED'] ? $_SERVER['ORIG_PATH_TRANSLATED'] : $_SERVER['PATH_TRANSLATED']) :
-               ($_SERVER['ORIG_SCRIPT_FILENAME'] ? $_SERVER['ORIG_SCRIPT_FILENAME'] : $_SERVER['SCRIPT_FILENAME']))));
-}
-
 if (!defined('PATH_t3lib'))            define('PATH_t3lib', PATH_site.'t3lib/');
 
 define('TYPO3_mainDir', 'typo3/');             // This is the directory of the backend administration for the sites of this TYPO3 installation.
@@ -503,4 +495,4 @@ if (TYPO3_DLOG) {
        t3lib_div::devLog('END of FRONTEND session', 'cms', 0, array('_FLUSH' => TRUE));
 }
 
-?>
+?>
\ No newline at end of file