Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

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

  • Loading branch information...
commit d24c408537089303dfcb2247916cc4f29778e373 2 parents 49b8b24 + 4172eac
@lorenzo lorenzo authored
Showing with 1 addition and 2 deletions.
  1. +1 −2  lib/Cake/Model/Datasource/DboSource.php
View
3  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;
Please sign in to comment.
Something went wrong with that request. Please try again.