Permalink
Browse files

Fixing undefined variable usage

Squash of pull request #872
  • Loading branch information...
1 parent 393849a commit 2d46fc60bef5d2f11bb745c0d2f8078ee99344f8 @h4ck3rm1k3 h4ck3rm1k3 committed with markstory Sep 28, 2012
Showing with 4 additions and 2 deletions.
  1. +1 −0 lib/Cake/Cache/Engine/WincacheEngine.php
  2. +2 −1 lib/Cake/Console/ShellDispatcher.php
  3. +1 −1 lib/Cake/Model/Model.php
View
1 lib/Cake/Cache/Engine/WincacheEngine.php
@@ -183,6 +183,7 @@ public function groups() {
* @return boolean success
**/
public function clearGroup($group) {
+ $success = null;
wincache_ucache_inc($this->settings['prefix'] . $group, 1, $success);
return $success;
}
View
3 lib/Cake/Console/ShellDispatcher.php
@@ -215,7 +215,8 @@ public function dispatch() {
return $Shell->main();
}
}
- throw new MissingShellMethodException(array('shell' => $shell, 'method' => $arg));
+
+ throw new MissingShellMethodException(array('shell' => $shell, 'method' => $command));
}
/**
View
2 lib/Cake/Model/Model.php
@@ -3250,7 +3250,7 @@ public function joinModel($assoc, $keys = array()) {
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
);
}

0 comments on commit 2d46fc6

Please sign in to comment.