adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 11:28:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Adding a protection to cake console be executed in driver root (windows). Fixes #1408.

Browse source
This commit is contained in:
Juan Basso 2011-02-21 17:55:15 -03:00
parent 0e7f2efdb1
commit 21a9904a71
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cake/console/cake.bat
View file

@ -26,7 +26,7 @@
SET app=%0
SET lib=%~dp0
php -q "%lib%cake.php" -working "%CD%" %*
php -q "%lib%cake.php" -working "%CD% " %*
echo.

9
cake/console/cake.php
View file

@ -501,6 +501,9 @@ class ShellDispatcher {
}
$params = str_replace('\\', '/', $params);
if (isset($params['working'])) {
$params['working'] = trim($params['working']);
}
if (!empty($params['working']) && (!isset($this->args[0]) || isset($this->args[0]) && $this->args[0]{0} !== '.')) {
if (empty($this->params['app']) && $params['working'] != $params['root']) {
$params['root'] = dirname($params['working']);
@ -516,8 +519,10 @@ class ShellDispatcher {
$params['root'] .= '/' . dirname($params['app']);
}
$params['app'] = basename($params['app']);
$params['working'] = rtrim($params['root'], '/') . '/' . $params['app'];
$params['working'] = rtrim($params['root'], '/');
if (!$isWin || !preg_match('/^[A-Z]:$/i', $params['app'])) {
$params['working'] .= '/' . $params['app'];
}
if (!empty($matches[0]) || !empty($isWin)) {
$params = str_replace('/', '\\', $params);