Permalink
Browse files

Merge branch '1.3' of git@github.com:cakephp/cakephp1x into 1.3

  • Loading branch information...
2 parents d5fa897 + a1124e3 commit ff1611e7cb2bbdff8bcbd267ab1074643fc769cc @lorenzo lorenzo committed Feb 28, 2010
Showing with 6 additions and 3 deletions.
  1. +6 −3 cake/console/cake.php
View
9 cake/console/cake.php
@@ -244,6 +244,9 @@ function __bootstrap() {
define('APP_DIR', $this->params['app']);
define('APP_PATH', $this->params['working'] . DS);
define('WWW_ROOT', APP_PATH . $this->params['webroot'] . DS);
+ if (!is_dir(ROOT . DS . APP_DIR . DS . 'tmp')) {
+ define('TMP', CORE_PATH . 'cake' . DS . 'console' . DS . 'templates' . DS . 'skel' . DS . 'tmp' . DS);
+ }
$includes = array(
CORE_PATH . 'cake' . DS . 'config' . DS . 'paths.php',
@@ -622,14 +625,14 @@ function help() {
$columns = max(1, floor($width / 30));
$rows = ceil(count($shellList) / $columns);
- foreach($shellList as $shell => $types) {
+ foreach ($shellList as $shell => $types) {
sort($types);
$shellList[$shell] = str_pad($shell . ' [' . implode ($types, ', ') . ']', $width / $columns);
}
$out = array_chunk($shellList, $rows);
- for($i = 0; $i < $rows; $i++) {
+ for ($i = 0; $i < $rows; $i++) {
$row = '';
- for($j = 0; $j < $columns; $j++) {
+ for ($j = 0; $j < $columns; $j++) {
if (!isset($out[$j][$i])) {
continue;
}

0 comments on commit ff1611e

Please sign in to comment.