adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-31 09:06:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

add CAKE to the paths after handling parameters that depend on _isExtractingApp() return value, fixes LH-3442

Browse source
This commit is contained in:
Ceeram 2013-03-04 14:49:01 +01:00
parent e3b870dbf7
commit e2ebeefda0
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
lib/Cake/Console/Command/Task/ExtractTask.php
View file

@ -178,14 +178,6 @@ class ExtractTask extends AppShell {
$this->_extractCore = strtolower($response) === 'y'; $this->_extractCore = strtolower($response) === 'y';
} }
if ($this->_extractCore) {
$this->_paths[] = CAKE;
$this->_exclude = array_merge($this->_exclude, array(
CAKE . 'Test',
CAKE . 'Console' . DS . 'Templates'
));
}
if (!empty($this->params['exclude-plugins']) && $this->_isExtractingApp()) { if (!empty($this->params['exclude-plugins']) && $this->_isExtractingApp()) {
$this->_exclude = array_merge($this->_exclude, App::path('plugins')); $this->_exclude = array_merge($this->_exclude, App::path('plugins'));
} }
@ -197,6 +189,14 @@ class ExtractTask extends AppShell {
$this->_validationDomain = $this->params['validation-domain']; $this->_validationDomain = $this->params['validation-domain'];
} }
if ($this->_extractCore) {
$this->_paths[] = CAKE;
$this->_exclude = array_merge($this->_exclude, array(
CAKE . 'Test',
CAKE . 'Console' . DS . 'Templates'
));
}
if (isset($this->params['output'])) { if (isset($this->params['output'])) {
$this->_output = $this->params['output']; $this->_output = $this->params['output'];
} elseif (isset($this->params['plugin'])) { } elseif (isset($this->params['plugin'])) {