From ad7df4d13760ff2e51c6122caeadc84823936a84 Mon Sep 17 00:00:00 2001 From: Jens Jacobsen Date: Mon, 13 May 2013 10:59:09 +0200 Subject: [PATCH 1/2] Use PHP constant instead of custom code. --- typo3-probe.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/typo3-probe.php b/typo3-probe.php index 8c96e53..b2f62da 100644 --- a/typo3-probe.php +++ b/typo3-probe.php @@ -233,8 +233,7 @@ public function getStatus() { */ protected function checkCurrentDirectoryIsInIncludePath() { $includePath = ini_get('include_path'); - $delimiter = $this->isWindowsOs() ? ';' : ':'; - $pathArray = $this->trimExplode($delimiter, $includePath); + $pathArray = $this->trimExplode(PATH_SEPARATOR, $includePath); if (!in_array('.', $pathArray)) { $status = new WarningStatus(); $status->setTitle('Current directory (./) is not in include path'); @@ -1326,4 +1325,4 @@ function printStatus($statuses) {

Report bugs for TYPO3 Probe

- \ No newline at end of file + From 6d8f0dd06c4fecaadf4df09bfbf1717fb409cdc1 Mon Sep 17 00:00:00 2001 From: Jens Jacobsen Date: Mon, 13 May 2013 11:19:14 +0200 Subject: [PATCH 2/2] Darwin is not Windows. --- typo3-probe.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/typo3-probe.php b/typo3-probe.php index b2f62da..0881fc4 100644 --- a/typo3-probe.php +++ b/typo3-probe.php @@ -1159,7 +1159,7 @@ protected function isValidIp($ip) { */ protected function isWindowsOs() { $windowsOs = FALSE; - if (stristr(PHP_OS, 'darwin') && stristr(PHP_OS, 'win')) { + if (!stristr(PHP_OS, 'darwin') && stristr(PHP_OS, 'win')) { $windowsOs = TRUE; } return $windowsOs;