Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[BUGFIX] Fix obsolete trailing slash in PATH_site #252

Merged
merged 1 commit into from
Jul 27, 2016
Merged

[BUGFIX] Fix obsolete trailing slash in PATH_site #252

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion Scripts/typo3cms
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ if (file_exists(__DIR__ . '/typo3cms.php')) {
require __DIR__ . '/typo3cms.php';
} elseif (file_exists(__DIR__ . '/typo3conf/ext/typo3_console/Scripts/typo3cms.php')) {
// In non composer mode we're copied into TYPO3 web root
putenv('TYPO3_PATH_WEB=' . __DIR__ . '/');
putenv('TYPO3_PATH_WEB=' . __DIR__);
require __DIR__ . '/typo3conf/ext/typo3_console/Scripts/typo3cms.php';
}
echo 'Could not find console! Make sure typo3cms binary is up to date!' . PHP_EOL;
Expand Down
4 changes: 2 additions & 2 deletions Scripts/typo3cms.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
if (getenv('TYPO3_PATH_WEB')) {
// In case we are symlinked (like for travis tests),
// we need to accept the location from the outside to find the autoload.php
$typo3Root = rtrim(getenv('TYPO3_PATH_WEB'), '/\\');
$typo3Root = getenv('TYPO3_PATH_WEB');
} else {
// Assume TYPO3 web root and vendor dir (only one is applicable at the same time)
// Both only works if the package is *NOT* symlinked to the typo3conf/ext or vendor folder
Expand All @@ -43,7 +43,7 @@
putenv('TYPO3_PATH_WEB=' . $typo3Root);
}

define('PATH_site', str_replace('\\', '/', getenv('TYPO3_PATH_WEB')) . '/');
define('PATH_site', str_replace('\\', '/', rtrim(getenv('TYPO3_PATH_WEB'), '\\/')) . '/');
define('PATH_thisScript', realpath(PATH_site . 'typo3/cli_dispatch.phpsh'));

if (!class_exists('Helhum\\Typo3Console\\Core\\ConsoleBootstrap')) {
Expand Down