Permalink
Browse files

Merge 3.3/develop with 3.2/develop

  • Loading branch information...
2 parents 1e99859 + dce0252 commit e7d9b4646f1dd5195459c9d626c51d35637ba67d Isaiah DeRose-Wilson committed Jun 1, 2012
Showing with 3 additions and 3 deletions.
  1. +3 −3 classes/Kohana/ORM.php
View
@@ -439,7 +439,7 @@ public function reload_columns($force = FALSE)
else
{
// Grab column information from database
- $this->_table_columns = $this->list_columns(TRUE);
+ $this->_table_columns = $this->list_columns();
// Load column cache
ORM::$_column_cache[$this->_object_name] = $this->_table_columns;
@@ -539,7 +539,7 @@ public function __toString()
* Allows serialization of only the object data and state, to prevent
* "stale" objects being unserialized, which also requires less memory.
*
- * @return array
+ * @return string
*/
public function serialize()
{
@@ -1406,7 +1406,7 @@ public function save(Validation $validation = NULL)
}
/**
- * Deletes a single record or multiple records, ignoring relationships.
+ * Deletes a single record while ignoring relationships.
*
* @chainable
* @return ORM

0 comments on commit e7d9b46

Please sign in to comment.