adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 11:28:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote branch 'origin/1.3' into 1.3

Browse source
This commit is contained in:
predominant 2010-03-09 14:31:16 +11:00
commit 9cc460ce6d
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cake/console/libs/tasks/fixture.php
View file

@ -106,7 +106,7 @@ class FixtureTask extends BakeTask {
* @access private
*/
function __interactive() {
$this->interactive = true;
$this->DbConfig->interactive = $this->Model->interactive = $this->interactive = true;
$this->hr();
$this->out(sprintf("Bake Fixture\nPath: %s", $this->path));
$this->hr();

2
cake/console/libs/tasks/view.php
View file

@ -211,6 +211,8 @@ class ViewTask extends BakeTask {
$this->out(sprintf("Bake View\nPath: %s", $this->path));
$this->hr();
$this->DbConfig->interactive = $this->Controller->interactive = $this->interactive = true;
if (empty($this->connection)) {
$this->connection = $this->DbConfig->getConfig();
}