Merge branch '2.0' of github.com:cakephp/cakephp into 2.0

cakephp · Sep 3, 2011 · d24c408 · d24c408
2 parents 49b8b24 + 4172eac
commit d24c408
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/lib/Cake/Model/Datasource/DboSource.php b/lib/Cake/Model/Datasource/DboSource.php
@@ -2639,11 +2639,10 @@ public function hasAny($Model, $sql) {
  * Gets the length of a database-native column description, or null if no length
  *
  * @param string $real Real database-layer column type (i.e. "varchar(255)")
- * @return mixed An integer or string representing the length of the column
+ * @return mixed An integer or string representing the length of the column, or null for unknown length.
  */
 	public function length($real) {
 		if (!preg_match_all('/([\w\s]+)(?:\((\d+)(?:,(\d+))?\))?(\sunsigned)?(\szerofill)?/', $real, $result)) {
-			trigger_error(__d('cake_dev', "FIXME: Can't parse field: " . $real), E_USER_WARNING);
 			$col = str_replace(array(')', 'unsigned'), '', $real);
 			$limit = null;