adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-18 18:46:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch '1.3-bake' into 1.3

Browse source
This commit is contained in:
gwoo 2009-07-24 10:37:22 -07:00
commit 38e1954996
2 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
cake/console/libs/tasks/plugin.php
View file

@ -137,18 +137,18 @@ class PluginTask extends Shell {
$Folder =& new Folder($this->path . $pluginPath); $Folder =& new Folder($this->path . $pluginPath);
$directories = array( $directories = array(
'config' . DS . 'sql', 'config' . DS . 'sql',
'models' . DS . 'behaviors', 'models' . DS . 'behaviors',
'controllers' . DS . 'components', 'controllers' . DS . 'components',
'views' . DS . 'helpers', 'views' . DS . 'helpers',
'tests' . DS . 'cases' . DS . 'components', 'tests' . DS . 'cases' . DS . 'components',
'tests' . DS . 'cases' . DS . 'helpers', 'tests' . DS . 'cases' . DS . 'helpers',
'tests' . DS . 'cases' . DS . 'behaviors', 'tests' . DS . 'cases' . DS . 'behaviors',
'tests' . DS . 'cases' . DS . 'controllers', 'tests' . DS . 'cases' . DS . 'controllers',
'tests' . DS . 'cases' . DS . 'models', 'tests' . DS . 'cases' . DS . 'models',
'tests' . DS . 'groups', 'tests' . DS . 'groups',
'tests' . DS . 'fixtures', 'tests' . DS . 'fixtures',
'vendors' . DS . 'img', 'vendors' . DS . 'img',
'vendors' . DS . 'js', 'vendors' . DS . 'js',
'vendors' . DS . 'css', 'vendors' . DS . 'css',
'vendors' . DS . 'shells' 'vendors' . DS . 'shells'
); );

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

@ -136,7 +136,7 @@ class TemplateTask extends Shell {
if (!empty($this->params['theme']) && isset($this->templatePaths[$this->params['theme']])) { if (!empty($this->params['theme']) && isset($this->templatePaths[$this->params['theme']])) {
return $this->templatePaths[$this->params['theme']]; return $this->templatePaths[$this->params['theme']];
} }
$this->hr(); $this->hr();
$this->out(__('You have more than one set of templates installed.', true)); $this->out(__('You have more than one set of templates installed.', true));
$this->out(__('Please choose the template set you wish to use:', true)); $this->out(__('Please choose the template set you wish to use:', true));