Merge pull request cakephp#1166 from ceeram/2.3-3442

add CAKE to the paths after handling parameters that depend on _isExtrac...
petteyg · Mar 4, 2013 · 6d821e8 · 6d821e8
2 parents e3b870d + e2ebeef
commit 6d821e8
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/lib/Cake/Console/Command/Task/ExtractTask.php b/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'])) {