Skip to content

[BUGFIX] wrong variable name, fix command for windows #6

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

Open
simonschaufi wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[BUGFIX] wrong variable name, fix command for windows #6

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions Classes/Utility/Shell.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ static function findCmd($cmd) {
'/usr/local/bin/',
'/bin/',
'/Applications/xampp/xamppfiles/bin/'
);
);
$binFolders = array_merge($binFolders, t3lib_div::trimExplode(',', $GLOBALS['TYPO3_CONF_VARS']['SYS']['binPath']));

$extensions = array('');
Expand All @@ -116,11 +116,14 @@ static function findCmd($cmd) {
}

foreach ($extensions as $extension) {
$cwd = false;
reset($binFolders);
foreach ($binFolders as $cwd) {
$which = t3lib_div::makeInstance('Tx_Contentstage_Utility_Shell');
$which->exec('which ' . $cwd . $cmd . $extension, '');
if (TYPO3_OS == 'WIN') {
$which->exec('WHERE ' . (($cwd === '') ? $cwd : $cwd . ':') . $cmd . $extension, '');
} else {
$which->exec('which ' . $cwd . $cmd . $extension, '');
}
$stdout = $which->getStdout();
if (strlen($stdout) > 0) {
return trim($stdout);
Expand Down
2 changes: 1 addition & 1 deletion Classes/Utility/Tca.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -558,7 +558,7 @@ public function isVisibleField($table, $field) {
return false;
}

return !isset($this->ignoreFields[$_table][$field]) || empty($this->ignoreFields[$_table][$field]);
return !isset($this->ignoreFields[$table][$field]) || empty($this->ignoreFields[$table][$field]);
}

/**
Expand Down