From 015ed82fec7b39234c1ac556472304ace775ffa5 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Sat, 4 Jul 2009 13:37:07 +0000
Subject: [PATCH] Fix: warning

---
 htdocs/install/upgrade2.php | 80 ++++++++++++++++++++-----------------
 1 file changed, 43 insertions(+), 37 deletions(-)

diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php
index aac7c468253..b7abfdd0944 100644
--- a/htdocs/install/upgrade2.php
+++ b/htdocs/install/upgrade2.php
@@ -2034,57 +2034,63 @@ function migrate_menus($db,$langs,$conf)
 
 	$error = 0;
 
-	$db->begin();
-
-	$sql = "SELECT m.rowid, mc.action";
-	$sql.= " FROM ".MAIN_DB_PREFIX."menu_constraint as mc, ".MAIN_DB_PREFIX."menu_const as md, ".MAIN_DB_PREFIX."menu as m";
-	$sql.= " WHERE md.fk_menu = m.rowid AND md.fk_constraint = mc.rowid";
-	$sql.= " AND m.enabled = '1'";
-	$resql = $db->query($sql);
-	if ($resql)
+	if ($db->DDLInfoTable(MAIN_DB_PREFIX."menu_constraint"))
 	{
-		$i = 0;
-		$num = $db->num_rows($resql);
-		if ($num)
+		$db->begin();
+		
+		$sql = "SELECT m.rowid, mc.action";
+		$sql.= " FROM ".MAIN_DB_PREFIX."menu_constraint as mc, ".MAIN_DB_PREFIX."menu_const as md, ".MAIN_DB_PREFIX."menu as m";
+		$sql.= " WHERE md.fk_menu = m.rowid AND md.fk_constraint = mc.rowid";
+		$sql.= " AND m.enabled = '1'";
+		$resql = $db->query($sql);
+		if ($resql)
 		{
-			while ($i < $num)
+			$i = 0;
+			$num = $db->num_rows($resql);
+			if ($num)
 			{
-				$obj = $db->fetch_object($resql);
-
-				$sql = "UPDATE ".MAIN_DB_PREFIX."menu SET";
-				$sql.= " enabled = '".$obj->action."'";
-				$sql.= " WHERE rowid=".$obj->rowid;
-				$sql.= " AND enabled = '1'";
-
-				$resql2=$db->query($sql);
-				if ($resql2)
+				while ($i < $num)
 				{
-
+					$obj = $db->fetch_object($resql);
+					
+					$sql = "UPDATE ".MAIN_DB_PREFIX."menu SET";
+					$sql.= " enabled = '".$obj->action."'";
+					$sql.= " WHERE rowid=".$obj->rowid;
+					$sql.= " AND enabled = '1'";
+					
+					$resql2=$db->query($sql);
+					if ($resql2)
+					{
+						
+					}
+					else
+					{
+						$error++;
+						dol_print_error($db);
+					}
+					print ". ";
+					$i++;
 				}
-				else
-				{
-					$error++;
-					dol_print_error($db);
-				}
-				print ". ";
-				$i++;
 			}
-
-		}
-
-		if ($error == 0)
-		{
-			$db->commit();
+			
+			if ($error == 0)
+			{
+				$db->commit();
+			}
+			else
+			{
+				$db->rollback();
+			}
 		}
 		else
 		{
+			dol_print_error($db);
 			$db->rollback();
 		}
 	}
 	else
 	{
-		dol_print_error($db);
-		$db->rollback();
+		print $langs->trans('AlreadyDone')."<br>\n";
 	}
 
 	print '</td></tr>';