ソースを参照

Fix double / issue in ExtractTask

Also fix an issue where extracting pot files for plugins ended up creating
a Localedefault.pot file incorrectly.

Fixes #2284
mark_story 14 年 前
コミット
4103fe14a2
1 ファイル変更2 行追加1 行削除
  1. 2 1
      lib/Cake/Console/Command/Task/ExtractTask.php

+ 2 - 1
lib/Cake/Console/Command/Task/ExtractTask.php

@@ -162,7 +162,7 @@ class ExtractTask extends Shell {
 		} else {
 			$message = __d('cake_console', "What is the path you would like to output?\n[Q]uit", $this->_paths[0] . DS . 'Locale');
 			while (true) {
-				$response = $this->in($message, null, $this->_paths[0] . DS . 'Locale');
+				$response = $this->in($message, null, rtrim($this->_paths[0], DS) . DS . 'Locale');
 				if (strtoupper($response) === 'Q') {
 					$this->out(__d('cake_console', 'Extract Aborted'));
 					$this->_stop();
@@ -187,6 +187,7 @@ class ExtractTask extends Shell {
 		if (empty($this->_files)) {
 			$this->_searchFiles();
 		}
+		$this->_output = rtrim($this->_output, DS) . DS;
 		$this->_extract();
 	}