From c9242d83ab92c5373e5ad5947d3e721549407033 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 11 Jul 2021 20:16:47 +0200 Subject: [PATCH] Clean code --- htdocs/core/lib/files.lib.php | 2 +- htdocs/install/upgrade2.php | 13 ------------- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php index 45253d6a441..a1085c019a8 100644 --- a/htdocs/core/lib/files.lib.php +++ b/htdocs/core/lib/files.lib.php @@ -1791,11 +1791,11 @@ function addFileIntoDatabaseIndex($dir, $file, $fullpathorig = '', $mode = 'uplo $ecmfile->src_object_id = $object->id; if (isset($object->table_element)) { $ecmfile->src_object_type = $object->table_element; - if (isset($object->src_object_description)) $ecmfile->description = $object->src_object_description; } else { dol_syslog('Error: object ' . get_class($object) . ' has no table_element attribute.'); return -1; } + if (isset($object->src_object_description)) $ecmfile->description = $object->src_object_description; if (isset($object->src_object_keywords)) $ecmfile->keywords = $object->src_object_keywords; } diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php index b0f4d831473..a11de7c447e 100644 --- a/htdocs/install/upgrade2.php +++ b/htdocs/install/upgrade2.php @@ -3439,19 +3439,6 @@ function migrate_categorie_association($db, $langs, $conf) } if (!$error) { - // TODO DROP table in the next release - /* - $sqlDrop = "DROP TABLE ".MAIN_DB_PREFIX."categorie_association"; - if ($db->query($sqlDrop)) - { - $db->commit(); - } - else - { - $db->rollback(); - } - */ - $db->commit(); } else { $db->rollback();