Skip to content

Commit

Permalink
Fixed coding style issues.
Browse files Browse the repository at this point in the history
  • Loading branch information
isaiahdw committed Dec 6, 2010
1 parent a2223d9 commit 346f52b
Showing 1 changed file with 6 additions and 9 deletions.
15 changes: 6 additions & 9 deletions classes/kohana/orm.php
Original file line number Diff line number Diff line change
Expand Up @@ -531,14 +531,11 @@ public function reload()
*/
public function __isset($column)
{
return
(
isset($this->_object[$column]) OR
return (isset($this->_object[$column]) OR
isset($this->_related[$column]) OR
isset($this->_has_one[$column]) OR
isset($this->_belongs_to[$column]) OR
isset($this->_has_many[$column])
);
isset($this->_has_many[$column]));
}

/**
Expand Down Expand Up @@ -811,7 +808,7 @@ public function values(array $values, array $expected = NULL)
continue;

// Try to set values to a related model
$model = $this->{$key}->values($values[$key], $column);
$this->{$key}->values($values[$key], $column);
}
else
{
Expand Down Expand Up @@ -1159,10 +1156,10 @@ protected function run_filter($column, $value)
$filters = $this->filters();

// Get the filters for this column
$wildcards = ! empty($filters[TRUE]) ? $filters[TRUE] : array();
$wildcards = empty($filters[TRUE]) ? array() : $filters[TRUE];

// Merge in the wildcards
$filters = ! empty($filters[$column]) ? array_merge($filters[$column], $wildcards) : $wildcards;
$filters = empty($filters[$column]) ? $wildcards : array_merge($filters[$column], $wildcards);

// Execute the filters
foreach ($filters as $filter => $params)
Expand Down Expand Up @@ -1348,7 +1345,7 @@ public function update(Validate $validate = NULL)
$id = $this->pk();

// Update a single record
$query = DB::update($this->_table_name)
DB::update($this->_table_name)
->set($data)
->where($this->_primary_key, '=', $id)
->execute($this->_db);
Expand Down

0 comments on commit 346f52b

Please sign in to comment.