Merge pull request #13887 from atm-florianm/FIX_9.0_fatal_during_migration_from_dolibarr_3.1_if_php7

FIX 9.0 - fatal during migration from 3.1 using PHP 7
This commit is contained in:
Laurent Destailleur 2020-05-14 15:49:08 +02:00 committed by GitHub
commit cf039b26f9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -3605,10 +3605,9 @@ function migrate_mode_reglement($db,$langs,$conf)
* @param DoliDB $db Database handler
* @param Translate $langs Object langs
* @param Conf $conf Object conf
* @param string $versionto Version target
* @return void
*/
function migrate_clean_association($db,$langs,$conf,$versionto)
function migrate_clean_association($db, $langs, $conf)
{
$result = $db->DDLDescTable(MAIN_DB_PREFIX."categorie_association");
if ($result) // result defined for version 3.2 or -