Fixing undefined variable usage

Squash of pull request #872
This commit is contained in:
James Michael DuPont 2012-09-28 06:57:31 +02:00 committed by mark_story
parent 393849a9ba
commit 2d46fc60be
3 changed files with 4 additions and 2 deletions

View file

@ -183,6 +183,7 @@ class WincacheEngine extends CacheEngine {
* @return boolean success
**/
public function clearGroup($group) {
$success = null;
wincache_ucache_inc($this->settings['prefix'] . $group, 1, $success);
return $success;
}

View file

@ -215,7 +215,8 @@ class ShellDispatcher {
return $Shell->main();
}
}
throw new MissingShellMethodException(array('shell' => $shell, 'method' => $arg));
throw new MissingShellMethodException(array('shell' => $shell, 'method' => $command));
}
/**

View file

@ -3250,7 +3250,7 @@ class Model extends Object implements CakeEventListener {
return array($with, array_unique(array_merge($assoc[$with], $keys)));
}
trigger_error(
__d('cake_dev', 'Invalid join model settings in %s', $model->alias),
__d('cake_dev', 'Invalid join model settings in %s. The association parameter has the wrong type, expecting a string or array, but was passed type: %s', $this->alias, gettype($assoc)),
E_USER_WARNING
);
}