From f3b990bf0f65d25b53e1f9942f751796d0c875e7 Mon Sep 17 00:00:00 2001 From: mark_story <mark@mark-story.com> Date: Sun, 5 Feb 2012 12:00:30 -0500 Subject: [PATCH] Correct path display for plugins. Fixes #2548 --- lib/Cake/Console/Command/Task/ControllerTask.php | 2 +- lib/Cake/Console/Command/Task/FixtureTask.php | 2 +- lib/Cake/Console/Command/Task/ModelTask.php | 2 +- lib/Cake/Console/Command/Task/TestTask.php | 2 +- lib/Cake/Console/Command/Task/ViewTask.php | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/Cake/Console/Command/Task/ControllerTask.php b/lib/Cake/Console/Command/Task/ControllerTask.php index 621b95cc8..c1178dcec 100644 --- a/lib/Cake/Console/Command/Task/ControllerTask.php +++ b/lib/Cake/Console/Command/Task/ControllerTask.php @@ -126,7 +126,7 @@ class ControllerTask extends BakeTask { protected function _interactive() { $this->interactive = true; $this->hr(); - $this->out(__d('cake_console', "Bake Controller\nPath: %s", $this->path)); + $this->out(__d('cake_console', "Bake Controller\nPath: %s", $this->getPath())); $this->hr(); if (empty($this->connection)) { diff --git a/lib/Cake/Console/Command/Task/FixtureTask.php b/lib/Cake/Console/Command/Task/FixtureTask.php index 36c51e3d7..bf58cd4a7 100644 --- a/lib/Cake/Console/Command/Task/FixtureTask.php +++ b/lib/Cake/Console/Command/Task/FixtureTask.php @@ -137,7 +137,7 @@ class FixtureTask extends BakeTask { protected function _interactive() { $this->DbConfig->interactive = $this->Model->interactive = $this->interactive = true; $this->hr(); - $this->out(__d('cake_console', "Bake Fixture\nPath: %s", $this->path)); + $this->out(__d('cake_console', "Bake Fixture\nPath: %s", $this->getPath())); $this->hr(); if (!isset($this->connection)) { diff --git a/lib/Cake/Console/Command/Task/ModelTask.php b/lib/Cake/Console/Command/Task/ModelTask.php index 3fb6c2e6a..28bfefd5e 100644 --- a/lib/Cake/Console/Command/Task/ModelTask.php +++ b/lib/Cake/Console/Command/Task/ModelTask.php @@ -190,7 +190,7 @@ class ModelTask extends BakeTask { */ protected function _interactive() { $this->hr(); - $this->out(__d('cake_console', "Bake Model\nPath: %s", $this->path)); + $this->out(__d('cake_console', "Bake Model\nPath: %s", $this->getPath())); $this->hr(); $this->interactive = true; diff --git a/lib/Cake/Console/Command/Task/TestTask.php b/lib/Cake/Console/Command/Task/TestTask.php index 503ddd77f..66646f597 100644 --- a/lib/Cake/Console/Command/Task/TestTask.php +++ b/lib/Cake/Console/Command/Task/TestTask.php @@ -94,7 +94,7 @@ class TestTask extends BakeTask { $this->interactive = true; $this->hr(); $this->out(__d('cake_console', 'Bake Tests')); - $this->out(__d('cake_console', 'Path: %s', $this->path)); + $this->out(__d('cake_console', 'Path: %s', $this->getPath())); $this->hr(); if ($type) { diff --git a/lib/Cake/Console/Command/Task/ViewTask.php b/lib/Cake/Console/Command/Task/ViewTask.php index b125d0791..4fe53b7ec 100644 --- a/lib/Cake/Console/Command/Task/ViewTask.php +++ b/lib/Cake/Console/Command/Task/ViewTask.php @@ -195,7 +195,7 @@ class ViewTask extends BakeTask { */ protected function _interactive() { $this->hr(); - $this->out(sprintf("Bake View\nPath: %s", $this->path)); + $this->out(sprintf("Bake View\nPath: %s", $this->getPath())); $this->hr(); $this->DbConfig->interactive = $this->Controller->interactive = $this->interactive = true;