From ad59f964ab7ad94f25356b2a2c425f988b0d4ae8 Mon Sep 17 00:00:00 2001
From: Stefan Neufeind <typo3.neufeind@speedpartner.de>
Date: Fri, 12 Jul 2013 21:27:45 +0200
Subject: [PATCH] [TASK] require-statements should use absolute paths
require-statements relying on the current working-
directory and/or a certain include-path setting
can cause unexpected behaviour.
A path is added for those cases. For the current
working-directory simply using __DIR__ is okay.
Change-Id: I959c8f4a1d25ca1403e7dcecb0bc20826c7c5059
Resolves: #49991
Releases: 6.2
Reviewed-on: https://review.typo3.org/22270
Reviewed-by: Christian Kuhn
Tested-by: Christian Kuhn
Reviewed-by: Anja Leichsenring
Tested-by: Anja Leichsenring
---
index.php | 2 +-
typo3/ajax.php | 2 +-
typo3/alt_clickmenu.php | 4 ++--
typo3/alt_doc_nodoc.php | 4 ++--
typo3/alt_shortcut.php | 4 ++--
typo3/browse_links.php | 4 ++--
typo3/browser.php | 2 +-
typo3/db_new.php | 4 ++--
typo3/dummy.php | 2 +-
typo3/file_edit.php | 4 ++--
typo3/file_newfolder.php | 4 ++--
typo3/file_rename.php | 4 ++--
typo3/file_upload.php | 4 ++--
typo3/index.php | 2 +-
typo3/init.php | 2 +-
typo3/listframe_loader.php | 2 +-
typo3/login_frameset.php | 2 +-
typo3/logout.php | 2 +-
typo3/mod.php | 2 +-
typo3/move_el.php | 2 +-
typo3/show_item.php | 2 +-
typo3/show_rechis.php | 2 +-
typo3/sysext/cms/layout/db_layout.php | 2 +-
typo3/sysext/cms/layout/db_new_content_el.php | 2 +-
typo3/sysext/core/Classes/Core/Bootstrap.php | 2 +-
.../dbal/Tests/Unit/Database/DatabaseConnectionMssqlTest.php | 2 +-
.../dbal/Tests/Unit/Database/DatabaseConnectionOracleTest.php | 2 +-
.../Tests/Unit/Database/DatabaseConnectionPostgresqlTest.php | 2 +-
typo3/sysext/func/mod1/index.php | 2 +-
typo3/sysext/impexp/app/index.php | 2 +-
typo3/sysext/info/mod1/index.php | 2 +-
typo3/sysext/install/Start/Install.php | 2 +-
typo3/sysext/rtehtmlarea/mod3/browse_links.php | 2 +-
typo3/sysext/rtehtmlarea/mod4/select_image.php | 2 +-
typo3/sysext/rtehtmlarea/mod5/user.php | 2 +-
typo3/sysext/rtehtmlarea/mod6/parse_html.php | 2 +-
typo3/sysext/version/cm1/index.php | 2 +-
typo3/tce_db.php | 2 +-
typo3/tce_file.php | 2 +-
typo3/thumbs.php | 2 +-
typo3/wizard_add.php | 2 +-
typo3/wizard_colorpicker.php | 2 +-
typo3/wizard_edit.php | 2 +-
typo3/wizard_forms.php | 2 +-
typo3/wizard_list.php | 2 +-
typo3/wizard_rte.php | 2 +-
typo3/wizard_table.php | 2 +-
47 files changed, 56 insertions(+), 56 deletions(-)
diff --git a/index.php b/index.php
index 43d98a76ea36..3c13487dbf2d 100644
--- a/index.php
+++ b/index.php
@@ -33,7 +33,7 @@
* @author René Fritz <r.fritz@colorcube.de>
*/
-require 'typo3/sysext/core/Classes/Core/Bootstrap.php';
+require __DIR__ . '/typo3/sysext/core/Classes/Core/Bootstrap.php';
\TYPO3\CMS\Core\Core\Bootstrap::getInstance()
->baseSetup('')
->redirectToInstallerIfLocalConfigurationFileDoesNotExist();
diff --git a/typo3/ajax.php b/typo3/ajax.php
index 3fd03d7a69d2..489654b6c0d9 100644
--- a/typo3/ajax.php
+++ b/typo3/ajax.php
@@ -53,7 +53,7 @@ if (in_array($ajaxID, $noUserAjaxIDs)) {
define('TYPO3_PROCEED_IF_NO_USER', 2);
}
-require 'init.php';
+require __DIR__ . '/init.php';
// finding the script path from the variable
$ajaxScript = $TYPO3_CONF_VARS['BE']['AJAX'][$ajaxID];
diff --git a/typo3/alt_clickmenu.php b/typo3/alt_clickmenu.php
index 3983a6c20454..b540711214e9 100644
--- a/typo3/alt_clickmenu.php
+++ b/typo3/alt_clickmenu.php
@@ -38,7 +38,7 @@
*
* @author Kasper Skårhøj <kasperYYYY@typo3.com>
*/
-require 'init.php';
+require __DIR__ . '/init.php';
$clickMenuController = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Backend\\Controller\\ClickMenuController');
@@ -52,4 +52,4 @@ foreach ($SOBE->include_once as $INC_FILE) {
$clickMenuController->main();
$clickMenuController->printContent();
-?>
\ No newline at end of file
+?>
diff --git a/typo3/alt_doc_nodoc.php b/typo3/alt_doc_nodoc.php
index bd2e23d62bd0..7e1eba2bd1eb 100644
--- a/typo3/alt_doc_nodoc.php
+++ b/typo3/alt_doc_nodoc.php
@@ -32,9 +32,9 @@
*
* @author Kasper Skårhøj <kasperYYYY@typo3.com>
*/
-require 'init.php';
+require __DIR__ . '/init.php';
$noDocumentsOpenController = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\CMS\Backend\Controller\NoDocumentsOpenController');
$noDocumentsOpenController->main();
$noDocumentsOpenController->printContent();
-?>
\ No newline at end of file
+?>
diff --git a/typo3/alt_shortcut.php b/typo3/alt_shortcut.php
index de55bee6a737..8456d6a9ed01 100644
--- a/typo3/alt_shortcut.php
+++ b/typo3/alt_shortcut.php
@@ -33,11 +33,11 @@
*
* @author Kasper Skårhøj <kasperYYYY@typo3.com>
*/
-require 'init.php';
+require __DIR__ . '/init.php';
$shortcutFrameController = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Backend\\Controller\\ShortcutFrameController');
$shortcutFrameController->preprocess();
$shortcutFrameController->init();
$shortcutFrameController->main();
$shortcutFrameController->printContent();
-?>
\ No newline at end of file
+?>
diff --git a/typo3/browse_links.php b/typo3/browse_links.php
index 3adce0ca7f5a..fe210918942e 100644
--- a/typo3/browse_links.php
+++ b/typo3/browse_links.php
@@ -32,9 +32,9 @@
*
* @author Kasper Skårhøj <kasperYYYY@typo3.com>
*/
-require 'init.php';
+require __DIR__ . '/init.php';
$elementBrowserController = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Recordlist\\Controller\\ElementBrowserController');
$elementBrowserController->main();
$elementBrowserController->printContent();
-?>
\ No newline at end of file
+?>
diff --git a/typo3/browser.php b/typo3/browser.php
index 361398fb4fe0..b11d0cc28311 100644
--- a/typo3/browser.php
+++ b/typo3/browser.php
@@ -30,7 +30,7 @@
*
* @author Kasper Skårhøj <kasperYYYY@typo3.com>
*/
-require 'init.php';
+require __DIR__ . '/init.php';
$elementBrowserFramesetController = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Recordlist\\Controller\\ElementBrowserFramesetController');
$elementBrowserFramesetController->main();
diff --git a/typo3/db_new.php b/typo3/db_new.php
index b0131b73dc04..809b0a48805e 100644
--- a/typo3/db_new.php
+++ b/typo3/db_new.php
@@ -33,7 +33,7 @@
*
* @author Kasper Skårhøj <kasperYYYY@typo3.com>
*/
-require 'init.php';
+require __DIR__ . '/init.php';
/**
* Extension for the tree class that generates the tree of pages in the page-wizard mode
@@ -70,4 +70,4 @@ class localPageTree extends \TYPO3\CMS\Backend\Tree\View\PageTreeView {
$newRecordController = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Backend\\Controller\\NewRecordController');
$newRecordController->main();
$newRecordController->printContent();
-?>
\ No newline at end of file
+?>
diff --git a/typo3/dummy.php b/typo3/dummy.php
index ef175ccaae00..0045a467a5d0 100644
--- a/typo3/dummy.php
+++ b/typo3/dummy.php
@@ -30,7 +30,7 @@
*
* @author Kasper Skårhøj <kasperYYYY@typo3.com>
*/
-require 'init.php';
+require __DIR__ . '/init.php';
$dummyController = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Backend\\Controller\\DummyController');
$dummyController->main();
diff --git a/typo3/file_edit.php b/typo3/file_edit.php
index ea24e7b982a4..33b6d1d313aa 100644
--- a/typo3/file_edit.php
+++ b/typo3/file_edit.php
@@ -30,9 +30,9 @@
*
* @author Kasper Skårhøj <kasperYYYY@typo3.com>
*/
-require 'init.php';
+require __DIR__ . '/init.php';
$editFileController = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Backend\\Controller\\File\\EditFileController');
$editFileController->main();
$editFileController->printContent();
-?>
\ No newline at end of file
+?>
diff --git a/typo3/file_newfolder.php b/typo3/file_newfolder.php
index 1f35dcd0617a..3b0263999e20 100644
--- a/typo3/file_newfolder.php
+++ b/typo3/file_newfolder.php
@@ -30,9 +30,9 @@
*
* @author Kasper Skårhøj <kasperYYYY@typo3.com>
*/
-require 'init.php';
+require __DIR__ . '/init.php';
$createFolderController = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Backend\\Controller\\File\\CreateFolderController');
$createFolderController->main();
$createFolderController->printContent();
-?>
\ No newline at end of file
+?>
diff --git a/typo3/file_rename.php b/typo3/file_rename.php
index d559706cee96..e3f378552b47 100644
--- a/typo3/file_rename.php
+++ b/typo3/file_rename.php
@@ -30,9 +30,9 @@
*
* @author Kasper Skårhøj <kasperYYYY@typo3.com>
*/
-require 'init.php';
+require __DIR__ . '/init.php';
$renameFileController = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Backend\\Controller\\File\\RenameFileController');
$renameFileController->main();
$renameFileController->printContent();
-?>
\ No newline at end of file
+?>
diff --git a/typo3/file_upload.php b/typo3/file_upload.php
index 29ed1995476c..f6bb819a04f5 100644
--- a/typo3/file_upload.php
+++ b/typo3/file_upload.php
@@ -30,9 +30,9 @@
*
* @author Kasper Skårhøj <kasperYYYY@typo3.com>
*/
-require 'init.php';
+require __DIR__ . '/init.php';
$fileUploadController = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Backend\\Controller\\File\\FileUploadController');
$fileUploadController->main();
$fileUploadController->printContent();
-?>
\ No newline at end of file
+?>
diff --git a/typo3/index.php b/typo3/index.php
index 6ec242dc5903..b261c64ccee5 100644
--- a/typo3/index.php
+++ b/typo3/index.php
@@ -31,7 +31,7 @@
* @author Kasper Skårhøj <kasperYYYY@typo3.com>
*/
define('TYPO3_PROCEED_IF_NO_USER', 1);
-require 'init.php';
+require __DIR__ . '/init.php';
$loginController = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Backend\\Controller\\LoginController');
$loginController->main();
diff --git a/typo3/init.php b/typo3/init.php
index 70dcd941bcda..edfb16b3f485 100644
--- a/typo3/init.php
+++ b/typo3/init.php
@@ -52,7 +52,7 @@
*/
define('TYPO3_MODE', 'BE');
-require 'sysext/core/Classes/Core/Bootstrap.php';
+require __DIR__ . '/sysext/core/Classes/Core/Bootstrap.php';
\TYPO3\CMS\Core\Core\Bootstrap::getInstance()
->baseSetup('typo3/')
diff --git a/typo3/listframe_loader.php b/typo3/listframe_loader.php
index cedbe6117c4a..886085e90f8e 100644
--- a/typo3/listframe_loader.php
+++ b/typo3/listframe_loader.php
@@ -30,7 +30,7 @@
*
* @author Kasper Skårhøj <kasperYYYY@typo3.com>
*/
-require 'init.php';
+require __DIR__ . '/init.php';
$listFrameLoaderController = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Backend\\Controller\\ListFrameLoaderController');
$listFrameLoaderController->main();
diff --git a/typo3/login_frameset.php b/typo3/login_frameset.php
index 0294b78473fe..bb1dc8a3fc35 100644
--- a/typo3/login_frameset.php
+++ b/typo3/login_frameset.php
@@ -33,7 +33,7 @@
* @author Kasper Skårhøj <kasperYYYY@typo3.com>
*/
define('TYPO3_PROCEED_IF_NO_USER', 1);
-require 'init.php';
+require __DIR__ . '/init.php';
// Make instance:
$loginFramesetController = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Backend\\Controller\\LoginFramesetController');
diff --git a/typo3/logout.php b/typo3/logout.php
index 47807ee52cec..def46ad47b9b 100644
--- a/typo3/logout.php
+++ b/typo3/logout.php
@@ -31,7 +31,7 @@
*
* @author Kasper Skårhøj <kasperYYYY@typo3.com>
*/
-require 'init.php';
+require __DIR__ . '/init.php';
$logoutController = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Backend\\Controller\\LogoutController');
$logoutController->logout();
diff --git a/typo3/mod.php b/typo3/mod.php
index 08a935a038d6..4042ece274c2 100644
--- a/typo3/mod.php
+++ b/typo3/mod.php
@@ -30,7 +30,7 @@
* @author Kasper Skårhøj <kasperYYYY@typo3.com>
*/
unset($MCONF);
-require 'init.php';
+require __DIR__ . '/init.php';
// Find module path:
$temp_M = (string) \TYPO3\CMS\Core\Utility\GeneralUtility::_GET('M');
$isDispatched = FALSE;
diff --git a/typo3/move_el.php b/typo3/move_el.php
index 578adf35cce7..8c8bc9e8c21e 100644
--- a/typo3/move_el.php
+++ b/typo3/move_el.php
@@ -31,7 +31,7 @@
*
* @author Kasper Skårhøj <kasperYYYY@typo3.com>
*/
-require 'init.php';
+require __DIR__ . '/init.php';
/**
* Local extension of the page tree class
diff --git a/typo3/show_item.php b/typo3/show_item.php
index 63cb9c4b099a..02b8addff0c4 100644
--- a/typo3/show_item.php
+++ b/typo3/show_item.php
@@ -25,7 +25,7 @@
* This copyright notice MUST APPEAR in all copies of the script!
***************************************************************/
-require 'init.php';
+require __DIR__ . '/init.php';
$elementInformationController = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
'TYPO3\\CMS\\Backend\\Controller\\ContentElement\\ElementInformationController'
diff --git a/typo3/show_rechis.php b/typo3/show_rechis.php
index b56be556112b..9f417e52f39a 100644
--- a/typo3/show_rechis.php
+++ b/typo3/show_rechis.php
@@ -30,7 +30,7 @@
*
* @author Kasper Skårhøj <kasperYYYY@typo3.com>
*/
-require 'init.php';
+require __DIR__ . '/init.php';
$elementHistoryController = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Backend\\Controller\\ContentElement\\ElementHistoryController');
$elementHistoryController->main();
diff --git a/typo3/sysext/cms/layout/db_layout.php b/typo3/sysext/cms/layout/db_layout.php
index 0ed854a83b25..d557db629cb7 100755
--- a/typo3/sysext/cms/layout/db_layout.php
+++ b/typo3/sysext/cms/layout/db_layout.php
@@ -35,7 +35,7 @@
* @author Kasper Skårhøj <kasperYYYY@typo3.com>
*/
unset($MCONF);
-require 'conf.php';
+require __DIR__ . '/conf.php';
require $BACK_PATH . 'init.php';
$LANG->includeLLFile('EXT:cms/layout/locallang.xlf');
diff --git a/typo3/sysext/cms/layout/db_new_content_el.php b/typo3/sysext/cms/layout/db_new_content_el.php
index 83073fd0be9c..427a99d14574 100644
--- a/typo3/sysext/cms/layout/db_new_content_el.php
+++ b/typo3/sysext/cms/layout/db_new_content_el.php
@@ -34,7 +34,7 @@
* @author Kasper Skårhøj <kasperYYYY@typo3.com>
*/
unset($MCONF);
-require 'conf.php';
+require __DIR__ . '/conf.php';
require $BACK_PATH . 'init.php';
// Unset MCONF/MLANG since all we wanted was back path etc. for this particular script.
unset($MCONF);
diff --git a/typo3/sysext/core/Classes/Core/Bootstrap.php b/typo3/sysext/core/Classes/Core/Bootstrap.php
index 3e85c46f05ad..54114aebdfa9 100644
--- a/typo3/sysext/core/Classes/Core/Bootstrap.php
+++ b/typo3/sysext/core/Classes/Core/Bootstrap.php
@@ -29,7 +29,7 @@ namespace TYPO3\CMS\Core\Core;
use \TYPO3\CMS\Core\Utility;
-require 'SystemEnvironmentBuilder.php';
+require __DIR__ . '/SystemEnvironmentBuilder.php';
/**
* This class encapsulates bootstrap related methods.
diff --git a/typo3/sysext/dbal/Tests/Unit/Database/DatabaseConnectionMssqlTest.php b/typo3/sysext/dbal/Tests/Unit/Database/DatabaseConnectionMssqlTest.php
index eb7877069ee2..5319a7af30d2 100644
--- a/typo3/sysext/dbal/Tests/Unit/Database/DatabaseConnectionMssqlTest.php
+++ b/typo3/sysext/dbal/Tests/Unit/Database/DatabaseConnectionMssqlTest.php
@@ -27,7 +27,7 @@ class DatabaseConnectionMssqlTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
// Backup database connection
$this->db = $GLOBALS['TYPO3_DB'];
// Reconfigure DBAL to use MS SQL
- require 'Fixtures/mssql.config.php';
+ require __DIR__ . '/Fixtures/mssql.config.php';
$className = self::buildAccessibleProxy('TYPO3\\CMS\\Dbal\\Database\\DatabaseConnection');
$GLOBALS['TYPO3_DB'] = new $className();
$parserClassName = self::buildAccessibleProxy('TYPO3\\CMS\\Dbal\\Database\\SqlParser');
diff --git a/typo3/sysext/dbal/Tests/Unit/Database/DatabaseConnectionOracleTest.php b/typo3/sysext/dbal/Tests/Unit/Database/DatabaseConnectionOracleTest.php
index 5e4b7d070542..3e163e40de94 100644
--- a/typo3/sysext/dbal/Tests/Unit/Database/DatabaseConnectionOracleTest.php
+++ b/typo3/sysext/dbal/Tests/Unit/Database/DatabaseConnectionOracleTest.php
@@ -27,7 +27,7 @@ class DatabaseConnectionOracleTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
// Backup database connection
$this->db = $GLOBALS['TYPO3_DB'];
// Reconfigure DBAL to use Oracle
- require 'Fixtures/oci8.config.php';
+ require __DIR__ . '/Fixtures/oci8.config.php';
$className = self::buildAccessibleProxy('TYPO3\\CMS\\Dbal\\Database\\DatabaseConnection');
$GLOBALS['TYPO3_DB'] = new $className();
$parserClassName = self::buildAccessibleProxy('TYPO3\\CMS\\Dbal\\Database\\SqlParser');
diff --git a/typo3/sysext/dbal/Tests/Unit/Database/DatabaseConnectionPostgresqlTest.php b/typo3/sysext/dbal/Tests/Unit/Database/DatabaseConnectionPostgresqlTest.php
index ec90bb30b5a7..d70f22f7594d 100644
--- a/typo3/sysext/dbal/Tests/Unit/Database/DatabaseConnectionPostgresqlTest.php
+++ b/typo3/sysext/dbal/Tests/Unit/Database/DatabaseConnectionPostgresqlTest.php
@@ -27,7 +27,7 @@ class DatabaseConnectionPostgresqlTest extends \TYPO3\CMS\Core\Tests\UnitTestCas
// Backup database connection
$this->db = $GLOBALS['TYPO3_DB'];
// Reconfigure DBAL to use PostgreSQL
- require 'Fixtures/postgresql.config.php';
+ require __DIR__ . '/Fixtures/postgresql.config.php';
$className = self::buildAccessibleProxy('TYPO3\\CMS\\Dbal\\Database\\DatabaseConnection');
$GLOBALS['TYPO3_DB'] = new $className();
$parserClassName = self::buildAccessibleProxy('TYPO3\\CMS\\Dbal\\Database\\SqlParser');
diff --git a/typo3/sysext/func/mod1/index.php b/typo3/sysext/func/mod1/index.php
index 5c75793c6f65..8c4ac8a1c073 100755
--- a/typo3/sysext/func/mod1/index.php
+++ b/typo3/sysext/func/mod1/index.php
@@ -34,7 +34,7 @@
* @author Kasper Skårhøj <kasperYYYY@typo3.com>
*/
unset($MCONF);
-require 'conf.php';
+require __DIR__ . '/conf.php';
require $BACK_PATH . 'init.php';
$LANG->includeLLFile('EXT:lang/locallang_mod_web_func.xlf');
$BE_USER->modAccess($MCONF, 1);
diff --git a/typo3/sysext/impexp/app/index.php b/typo3/sysext/impexp/app/index.php
index 11c81fd9bc8e..82e0f3d6acb9 100755
--- a/typo3/sysext/impexp/app/index.php
+++ b/typo3/sysext/impexp/app/index.php
@@ -61,7 +61,7 @@
* external_ref[tables][]=table/_ALL
*/
unset($MCONF);
-require 'conf.php';
+require __DIR__ . '/conf.php';
require_once $BACK_PATH . 'init.php';
$LANG->includeLLFile('EXT:impexp/app/locallang.xlf');
\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::isLoaded('impexp', 1);
diff --git a/typo3/sysext/info/mod1/index.php b/typo3/sysext/info/mod1/index.php
index e64befd24c41..9ae1ccad8869 100755
--- a/typo3/sysext/info/mod1/index.php
+++ b/typo3/sysext/info/mod1/index.php
@@ -34,7 +34,7 @@
* @author Kasper Skårhøj <kasperYYYY@typo3.com>
*/
unset($MCONF);
-require 'conf.php';
+require __DIR__ . '/conf.php';
require $BACK_PATH . 'init.php';
$LANG->includeLLFile('EXT:lang/locallang_mod_web_info.xlf');
$BE_USER->modAccess($MCONF, 1);
diff --git a/typo3/sysext/install/Start/Install.php b/typo3/sysext/install/Start/Install.php
index f3b7b8f1321e..9f5fcca24953 100644
--- a/typo3/sysext/install/Start/Install.php
+++ b/typo3/sysext/install/Start/Install.php
@@ -105,7 +105,7 @@ define('TYPO3_MODE', 'BE');
define('TYPO3_enterInstallScript', '1');
// Bootstrap bare minimum: class loader, LocalConfiguration, but no extensions and such
-require '../../core/Classes/Core/Bootstrap.php';
+require __DIR__ . '/../../core/Classes/Core/Bootstrap.php';
\TYPO3\CMS\Core\Core\Bootstrap::getInstance()
->baseSetup('typo3/sysext/install/Start/')
->startOutputBuffering()
diff --git a/typo3/sysext/rtehtmlarea/mod3/browse_links.php b/typo3/sysext/rtehtmlarea/mod3/browse_links.php
index f283ab5fc63d..5ce9433a2bd9 100644
--- a/typo3/sysext/rtehtmlarea/mod3/browse_links.php
+++ b/typo3/sysext/rtehtmlarea/mod3/browse_links.php
@@ -37,7 +37,7 @@
*/
error_reporting(E_ALL & ~(E_STRICT | E_NOTICE | E_DEPRECATED));
unset($MCONF);
-require 'conf.php';
+require __DIR__ . '/conf.php';
require $BACK_PATH . 'init.php';
$LANG->includeLLFile('EXT:rtehtmlarea/mod3/locallang.xlf');
$LANG->includeLLFile('EXT:rtehtmlarea/htmlarea/locallang_dialogs.xlf');
diff --git a/typo3/sysext/rtehtmlarea/mod4/select_image.php b/typo3/sysext/rtehtmlarea/mod4/select_image.php
index 26e9837edb32..d539f26ee8a0 100644
--- a/typo3/sysext/rtehtmlarea/mod4/select_image.php
+++ b/typo3/sysext/rtehtmlarea/mod4/select_image.php
@@ -33,7 +33,7 @@
*/
error_reporting(E_ALL & ~(E_STRICT | E_NOTICE | E_DEPRECATED));
unset($MCONF);
-require 'conf.php';
+require __DIR__ . '/conf.php';
require $BACK_PATH . 'init.php';
$LANG->includeLLFile('EXT:lang/locallang_TYPO3\\CMS\\Recordlist\\Browser\\ElementBrowser.xlf');
$LANG->includeLLFile('EXT:rtehtmlarea/mod4/locallang.xlf');
diff --git a/typo3/sysext/rtehtmlarea/mod5/user.php b/typo3/sysext/rtehtmlarea/mod5/user.php
index 2ecb0c0f2ca0..0008f4825448 100644
--- a/typo3/sysext/rtehtmlarea/mod5/user.php
+++ b/typo3/sysext/rtehtmlarea/mod5/user.php
@@ -33,7 +33,7 @@
*/
error_reporting(E_ALL & ~(E_STRICT | E_NOTICE | E_DEPRECATED));
unset($MCONF);
-require 'conf.php';
+require __DIR__ . '/conf.php';
require $BACK_PATH . 'init.php';
$LANG->includeLLFile('EXT:rtehtmlarea/mod5/locallang.xlf');
$LANG->includeLLFile('EXT:rtehtmlarea/htmlarea/locallang_dialogs.xlf');
diff --git a/typo3/sysext/rtehtmlarea/mod6/parse_html.php b/typo3/sysext/rtehtmlarea/mod6/parse_html.php
index eaad179fd200..b0311596b6fa 100644
--- a/typo3/sysext/rtehtmlarea/mod6/parse_html.php
+++ b/typo3/sysext/rtehtmlarea/mod6/parse_html.php
@@ -31,7 +31,7 @@
*/
error_reporting(E_ALL & ~(E_STRICT | E_NOTICE | E_DEPRECATED));
unset($MCONF);
-require 'conf.php';
+require __DIR__ . '/conf.php';
require $BACK_PATH . 'init.php';
// Make instance:
$SOBE = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Rtehtmlarea\\ContentParser');
diff --git a/typo3/sysext/version/cm1/index.php b/typo3/sysext/version/cm1/index.php
index 768437dc283b..44b28c849556 100755
--- a/typo3/sysext/version/cm1/index.php
+++ b/typo3/sysext/version/cm1/index.php
@@ -23,7 +23,7 @@
***************************************************************/
unset($MCONF);
-require 'conf.php';
+require __DIR__ . '/conf.php';
require $BACK_PATH . 'init.php';
$GLOBALS['LANG']->includeLLFile('EXT:version/locallang.xlf');
$SOBE = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Version\\Controller\\VersionModuleController');
diff --git a/typo3/tce_db.php b/typo3/tce_db.php
index 4e0b4d484f09..a8a374aceada 100644
--- a/typo3/tce_db.php
+++ b/typo3/tce_db.php
@@ -33,7 +33,7 @@
*
* @author Kasper Skårhøj <kasperYYYY@typo3.com>
*/
-require 'init.php';
+require __DIR__ . '/init.php';
$simpleDataHandlerController = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Backend\\Controller\\SimpleDataHandlerController');
diff --git a/typo3/tce_file.php b/typo3/tce_file.php
index 426a8953dbec..74c3f603ac01 100644
--- a/typo3/tce_file.php
+++ b/typo3/tce_file.php
@@ -34,7 +34,7 @@
*
* @author Kasper Skårhøj <kasperYYYY@typo3.com>
*/
-require 'init.php';
+require __DIR__ . '/init.php';
$fileController = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Backend\\Controller\\File\\FileController');
$fileController->main();
diff --git a/typo3/thumbs.php b/typo3/thumbs.php
index 9750fe286029..57f32ea673b2 100644
--- a/typo3/thumbs.php
+++ b/typo3/thumbs.php
@@ -33,7 +33,7 @@
// Set error reporting
error_reporting(E_ALL & ~(E_STRICT | E_NOTICE | E_DEPRECATED));
-require 'init.php';
+require __DIR__ . '/init.php';
// Make instance:
$SOBE = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Backend\\View\\ThumbnailView');
diff --git a/typo3/wizard_add.php b/typo3/wizard_add.php
index 3dbe0b720e38..d0266f149c98 100644
--- a/typo3/wizard_add.php
+++ b/typo3/wizard_add.php
@@ -30,7 +30,7 @@
*
* @author Kasper Skårhøj <kasperYYYY@typo3.com>
*/
-require 'init.php';
+require __DIR__ . '/init.php';
$addController = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Backend\\Controller\\Wizard\\AddController');
$addController->main();
diff --git a/typo3/wizard_colorpicker.php b/typo3/wizard_colorpicker.php
index 8afa8b0b1e57..6c54ce781f19 100644
--- a/typo3/wizard_colorpicker.php
+++ b/typo3/wizard_colorpicker.php
@@ -32,7 +32,7 @@
* @author Peter Kühn <peter@kuehn.com>
* @author Kasper Skårhøj <typo3@typo3.com>
*/
-require 'init.php';
+require __DIR__ . '/init.php';
$colorpickerController = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Backend\\Controller\\Wizard\\ColorpickerController');
$colorpickerController->main();
diff --git a/typo3/wizard_edit.php b/typo3/wizard_edit.php
index 5ea856fff50a..c84f3760e7ec 100644
--- a/typo3/wizard_edit.php
+++ b/typo3/wizard_edit.php
@@ -30,7 +30,7 @@
*
* @author Kasper Skårhøj <kasperYYYY@typo3.com>
*/
-require 'init.php';
+require __DIR__ . '/init.php';
$editController = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Backend\\Controller\\Wizard\\EditController');
$editController->main();
diff --git a/typo3/wizard_forms.php b/typo3/wizard_forms.php
index 091ee98e6c41..277aacf861c2 100644
--- a/typo3/wizard_forms.php
+++ b/typo3/wizard_forms.php
@@ -30,7 +30,7 @@
*
* @author Kasper Skårhøj <kasperYYYY@typo3.com>
*/
-require 'init.php';
+require __DIR__ . '/init.php';
$formsController = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Backend\\Controller\\Wizard\\FormsController');
$formsController->main();
diff --git a/typo3/wizard_list.php b/typo3/wizard_list.php
index 57414ab4c725..04723d5b7107 100644
--- a/typo3/wizard_list.php
+++ b/typo3/wizard_list.php
@@ -30,7 +30,7 @@
*
* @author Kasper Skårhøj <kasperYYYY@typo3.com>
*/
-require 'init.php';
+require __DIR__ . '/init.php';
$listController = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Backend\\Controller\\Wizard\\ListController');
$listController->main();
diff --git a/typo3/wizard_rte.php b/typo3/wizard_rte.php
index c74bbc3d3a59..360178363d7f 100644
--- a/typo3/wizard_rte.php
+++ b/typo3/wizard_rte.php
@@ -30,7 +30,7 @@
*
* @author Kasper Skårhøj <kasperYYYY@typo3.com>
*/
-require 'init.php';
+require __DIR__ . '/init.php';
\TYPO3\CMS\Backend\Utility\BackendUtility::lockRecords();
$rteController = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Backend\\Controller\\Wizard\\RteController');
diff --git a/typo3/wizard_table.php b/typo3/wizard_table.php
index b2f25ac5aafa..09d848a61a18 100644
--- a/typo3/wizard_table.php
+++ b/typo3/wizard_table.php
@@ -31,7 +31,7 @@
*
* @author Kasper Skårhøj <kasperYYYY@typo3.com>
*/
-require 'init.php';
+require __DIR__ . '/init.php';
$tableController = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Backend\\Controller\\Wizard\\TableController');
$tableController->main();
--
GitLab