Skip to content
Snippets Groups Projects
Commit d40440fc authored by Laurent Destailleur's avatar Laurent Destailleur
Browse files

Merge remote-tracking branch 'origin/3.3' into develop

parents 6d843e76 5497b932
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
htdocs/install/upgrade.php
+ 68
− 65
View file @ d40440fc
...@@ -181,6 +181,8 @@ if (! GETPOST("action") || preg_match('/upgrade/i',GETPOST('action'))) ...@@ -181,6 +181,8 @@ if (! GETPOST("action") || preg_match('/upgrade/i',GETPOST('action')))
if ($ok) if ($ok)
{ {
$result = $db->DDLDescTable(MAIN_DB_PREFIX."categorie_association"); $result = $db->DDLDescTable(MAIN_DB_PREFIX."categorie_association");
if ($result) // result defined for version 3.2 or -
{
$obj = $db->fetch_object($result); $obj = $db->fetch_object($result);
if ($obj) // It table categorie_association exists if ($obj) // It table categorie_association exists
{ {
...@@ -251,6 +253,7 @@ if (! GETPOST("action") || preg_match('/upgrade/i',GETPOST('action'))) ...@@ -251,6 +253,7 @@ if (! GETPOST("action") || preg_match('/upgrade/i',GETPOST('action')))
} }
} }
} }
}
/* /*
* Remove deprecated indexes and constraints for Mysql * Remove deprecated indexes and constraints for Mysql
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment