Permalink
Browse files

add CAKE to the paths after handling parameters that depend on _isExt…

…ractingApp() return value, fixes LH-3442
  • Loading branch information...
1 parent e3b870d commit e2ebeefda0dd1fb8c8733c518966c99c2a5768e5 @ceeram ceeram committed Mar 4, 2013
Showing with 8 additions and 8 deletions.
  1. +8 −8 lib/Cake/Console/Command/Task/ExtractTask.php
@@ -178,14 +178,6 @@ public function execute() {
$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()) {
$this->_exclude = array_merge($this->_exclude, App::path('plugins'));
}
@@ -197,6 +189,14 @@ public function execute() {
$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'])) {
$this->_output = $this->params['output'];
} elseif (isset($this->params['plugin'])) {

0 comments on commit e2ebeef

Please sign in to comment.