adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-09-05 19:12:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

updating shell, fixes #4540 where shell name and model are the same

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6738 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
gwoo 2008-05-01 04:44:21 +00:00
parent f8f1380bcd
commit f6a78538ff
2 changed files with 40 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

27
cake/console/cake.php
View file

@ -188,10 +188,10 @@ class ShellDispatcher {
$this->shiftArgs();
$this->shellPaths = array(
APP . 'vendors' . DS . 'shells' . DS,
VENDORS . 'shells' . DS,
CONSOLE_LIBS
);
APP . 'vendors' . DS . 'shells' . DS,
VENDORS . 'shells' . DS,
CONSOLE_LIBS
);
}
/**
* Initializes the environment and loads the Cake core.
@ -213,7 +213,8 @@ class ShellDispatcher {
CORE_PATH . 'cake' . DS . 'libs' . DS . 'inflector.php',
CORE_PATH . 'cake' . DS . 'libs' . DS . 'configure.php',
CORE_PATH . 'cake' . DS . 'libs' . DS . 'cache.php',
CORE_PATH . 'cake' . DS . 'libs' . DS . 'string.php'
CORE_PATH . 'cake' . DS . 'libs' . DS . 'string.php',
CORE_PATH . 'cake' . DS . 'console' . DS . 'error.php'
);
foreach ($includes as $inc) {
@ -303,7 +304,7 @@ class ShellDispatcher {
$shell->loadTasks();
foreach ($shell->taskNames as $task) {
if (get_parent_class($shell->{$task}) == 'Shell') {
if (strtolower(get_parent_class($shell)) == 'shell') {
$shell->{$task}->initialize();
$shell->{$task}->loadTasks();
}
@ -337,12 +338,14 @@ class ShellDispatcher {
$missingCommand = true;
}
$protectedCommands = array('initialize','in','out','err','hr',
'createfile', 'isdir','copydir','object','tostring',
'requestaction','log','cakeerror', 'shelldispatcher',
'__initconstants','__initenvironment','__construct',
'dispatch','__bootstrap','getinput','stdout','stderr','parseparams','shiftargs'
);
$protectedCommands = array(
'initialize','in','out','err','hr',
'createfile', 'isdir','copydir','object','tostring',
'requestaction','log','cakeerror', 'shelldispatcher',
'__initconstants','__initenvironment','__construct',
'dispatch','__bootstrap','getinput','stdout','stderr','parseparams','shiftargs'
);
if (in_array(strtolower($command), $protectedCommands)) {
$missingCommand = true;
}