#2994, unnecessary calls to Model::__isset(null) #2995

Merged
merged 1 commit into from Mar 10, 2014

Projects

None yet

3 participants

@tharlinsmith

No description provided.

@markstory markstory added this to the 2.4.7 milestone Mar 10, 2014
@markstory markstory merged commit 47900c1 into cakephp:master Mar 10, 2014

1 check passed

Details default The Travis CI build passed
@dereuromark dereuromark commented on the diff Mar 11, 2014
lib/Cake/Model/Model.php
@@ -1408,7 +1408,7 @@ public function getColumnType($column) {
list($model, $column) = explode('.', $column);
}
- if ($model != $this->alias && isset($this->{$model})) {
+ if (isset($model) && $model != $this->alias && isset($this->{$model})) {
@dereuromark
dereuromark Mar 11, 2014

should also be !==

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment