Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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
  • Loading branch information...
commit 4103fe14a29f9d997d18b9293f00ed86acbbc47c 1 parent 07462f0
@markstory markstory authored
Showing with 2 additions and 1 deletion.
  1. +2 −1  lib/Cake/Console/Command/Task/ExtractTask.php
View
3  lib/Cake/Console/Command/Task/ExtractTask.php
@@ -162,7 +162,7 @@ public function execute() {
} 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 @@ public function execute() {
if (empty($this->_files)) {
$this->_searchFiles();
}
+ $this->_output = rtrim($this->_output, DS) . DS;
$this->_extract();
}
Please sign in to comment.
Something went wrong with that request. Please try again.