diff --git a/lib/Cake/Model/Model.php b/lib/Cake/Model/Model.php index 0cb53c31805..507877301f7 100644 --- a/lib/Cake/Model/Model.php +++ b/lib/Cake/Model/Model.php @@ -1721,7 +1721,7 @@ public function save($data = null, $validate = true, $fieldList = array()) { if (!empty($this->id)) { $success = (bool)$db->update($this, $fields, $values); } else { - if (empty($this->data[$this->alias][$this->primaryKey]) && $this->_isUUID($this->primaryKey)) { + if (empty($this->data[$this->alias][$this->primaryKey]) && $this->_isUUIDField($this->primaryKey)) { if (array_key_exists($this->primaryKey, $this->data[$this->alias])) { $j = array_search($this->primaryKey, $fields); $values[$j] = String::uuid(); @@ -1771,9 +1771,9 @@ public function save($data = null, $validate = true, $fieldList = array()) { * Check if the passed in field is a UUID field * * @param string $field the field to check - * @return array + * @return boolean */ - protected function _isUUID($field) { + protected function _isUUIDField($field) { $field = $this->schema($field); return $field['length'] == 36 && in_array($field['type'], array('string', 'binary')); } @@ -1800,7 +1800,7 @@ protected function _saveMulti($joined, $id, $db) { $dbMulti = $db; } - $isUUID = !empty($this->{$join}->primaryKey) && $this->{$join}->_isUUID($this->{$join}->primaryKey); + $isUUID = !empty($this->{$join}->primaryKey) && $this->{$join}->_isUUIDField($this->{$join}->primaryKey); $newData = $newValues = $newJoins = array(); $primaryAdded = false;