Skip to content

Commit

Permalink
Fix coding standards.
Browse files Browse the repository at this point in the history
  • Loading branch information
markstory committed Nov 2, 2013
1 parent 0f9904b commit 5aa3113
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Cake/ORM/Entity.php
Expand Up @@ -385,7 +385,7 @@ public function dirty($property, $isDirty = null) {
unset($this->_dirty[$property]);
return false;
}

$this->_dirty[$property] = true;
return true;
}
Expand Down
10 changes: 9 additions & 1 deletion Cake/ORM/Query.php
Expand Up @@ -614,9 +614,17 @@ public function first() {
$this->bufferResults();
$this->_results = $this->execute();
return $this->_results->one();

}

/**
* Toggle hydrating entites.
*
* If set to false array results will be returned
*
* @param boolean|null $enable Use a boolean to set the hydration mode.
* Null will fetch the current hydration mode.
* @return boolean|Query A boolean when reading, and $this when setting the mode.
*/
public function hydrate($enable = null) {
if ($enable === null) {
return $this->_hydrate;
Expand Down
1 change: 1 addition & 0 deletions Cake/ORM/Table.php
Expand Up @@ -869,6 +869,7 @@ protected function _insert($entity, $data) {
* @param \Cake\ORM\Entity the subject entity from were $data was extracted
* @param array $data The actual data that needs to be saved
* @return \Cake\ORM\Entity|boolean
* @throws \InvalidArgumentException When primary key data is missing.
*/
protected function _update($entity, $data) {
$primaryKey = $entity->extract((array)$this->primaryKey());
Expand Down

0 comments on commit 5aa3113

Please sign in to comment.