Permalink
Browse files

Merge branch '1.3-misc' into 1.3-merger

Conflicts:
	cake/libs/view/helpers/html.php
  • Loading branch information...
2 parents 6fdaa82 + 33ef318 commit 8cdee90b4fd95051d9d4cffe3e0bebf04de404cd @markstory markstory committed Nov 23, 2009
@@ -149,6 +149,9 @@ function bake($path, $skel = null, $skip = array('empty')) {
$verbose = $this->in(__('Do you want verbose output?', true), array('y', 'n'), 'n');
$Folder = new Folder($skel);
+ if (!empty($this->params['empty'])) {
+ $skip = array();
+ }
if ($Folder->copy(array('to' => $path, 'skip' => $skip))) {
$this->hr();
$this->out(sprintf(__("Created: %s in %s", true), $app, $path));
Oops, something went wrong.

0 comments on commit 8cdee90

Please sign in to comment.