lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Laurent Destailleur 2013-01-16 14:21:56 +01:00
commit d40440fc45
1 changed files with 63 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/install/upgrade.php
View File

@ -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')))
} }
} }
} }
}
/* /*
* Remove deprecated indexes and constraints for Mysql * Remove deprecated indexes and constraints for Mysql