Merge pull request #8328 from atm-alexis/FIX_commonObject_isInt_linked

Fix commonobject isInt for module builder capabilities
This commit is contained in:
Laurent Destailleur 2018-03-10 18:59:12 +01:00 committed by GitHub
commit 72eff36cd6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -5527,7 +5527,7 @@ abstract class CommonObject
$label = $val['label']; $label = $val['label'];
$type = $val['type']; $type = $val['type'];
$size = $val['css']; $size = $val['css'];
// Convert var to be able to share same code than showOutputField of extrafields // Convert var to be able to share same code than showOutputField of extrafields
if (preg_match('/varchar\((\d+)\)/', $type, $reg)) if (preg_match('/varchar\((\d+)\)/', $type, $reg))
{ {
@ -6203,7 +6203,7 @@ abstract class CommonObject
{ {
if(is_array($info)) if(is_array($info))
{ {
if(isset($info['type']) && ($info['type']=='int' || $info['type']=='integer' )) return true; if(isset($info['type']) && ($info['type']=='int' || preg_match('/^integer/i',$info['type']) ) ) return true;
else return false; else return false;
} }
else return false; else return false;