Skip to content

Commit 58f2185

Browse files
committed
Fix compatibility with MySQL >= 8.0.19; fixes #297
1 parent 4a90fe8 commit 58f2185

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

inc/object.class.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -602,8 +602,8 @@ function displayField($canedit, $name, $value, $template, $description = []) {
602602
}
603603
$this->endColumn();
604604
$this->startColumn();
605-
switch ($description['Type']) {
606-
case "int(11)":
605+
switch (preg_replace('/\(\d+\)$/', '', $description['Type'])) {
606+
case "int":
607607
$fk_table = getTableNameForForeignKeyField($name);
608608
if ($fk_table != '') {
609609
$itemtype = getItemTypeForTable($fk_table);
@@ -653,11 +653,11 @@ function displayField($canedit, $name, $value, $template, $description = []) {
653653
}
654654
break;
655655

656-
case "tinyint(1)":
656+
case "tinyint":
657657
Dropdown::showYesNo($name, $value);
658658
break;
659659

660-
case "varchar(255)":
660+
case "varchar":
661661
if (isset($searchoption['autoname']) && $searchoption['autoname']) {
662662
$objectName = autoName($this->fields[$name], $name, ($template === "newcomp"),
663663
$this->getType(), $this->fields["entities_id"]);

0 commit comments

Comments
 (0)