From 8d3f330b2dda2a4326743bddf4ec0cc391f3ea20 Mon Sep 17 00:00:00 2001
From: Francois Gaillard <francois.gaillard@prestashop.com>
Date: Wed, 3 Jul 2013 12:19:34 +0200
Subject: [PATCH] [-] IN : Fixed bug with database creation

---
 classes/db/DbMySQLi.php | 4 ++--
 classes/db/DbPDO.php    | 6 +++---
 classes/db/MySQL.php    | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/classes/db/DbMySQLi.php b/classes/db/DbMySQLi.php
index 258398491..4a31a47cf 100644
--- a/classes/db/DbMySQLi.php
+++ b/classes/db/DbMySQLi.php
@@ -63,8 +63,8 @@ class DbMySQLiCore extends Db
 		else
 			$link = @new mysqli($host, $user, $password);
 		$success = $link->query('CREATE DATABASE `'.bqSQL($dbname).'`');
-		if ($dropit)
-			$success &= $link->query('DROP DATABASE `'.bqSQL($dbname).'`');
+		if ($dropit && ($link->exec('DROP DATABASE `'.bqSQL($dbname).'`') !== false))
+			return true;
 		return $success;
 	}
 
diff --git a/classes/db/DbPDO.php b/classes/db/DbPDO.php
index db7f9fa26..fcf2013a7 100644
--- a/classes/db/DbPDO.php
+++ b/classes/db/DbPDO.php
@@ -51,10 +51,10 @@ class DbPDOCore extends Db
 		try {
 			$link = DbPDO::_getPDO($host, $user, $password, false);
 			$success = $link->exec('CREATE DATABASE `'.bqSQL($dbname).'`');
-			if ($dropit)
-				$success &= $link->exec('DROP DATABASE `'.bqSQL($dbname).'`');
+			if ($dropit && ($link->exec('DROP DATABASE `'.bqSQL($dbname).'`') !== false))
+				return true;
 		} catch (PDOException $e) {
-			$success = false;
+			return false;
 		}
 		return $success;
 	}
diff --git a/classes/db/MySQL.php b/classes/db/MySQL.php
index ae58d5ffb..8b7e0ca61 100644
--- a/classes/db/MySQL.php
+++ b/classes/db/MySQL.php
@@ -51,8 +51,8 @@ class MySQLCore extends Db
 	{
 		$link = mysql_connect($host, $user, $password);
 		$success = mysql_query('CREATE DATABASE `'.bqSQL($dbname).'`', $link);
-		if ($dropit)
-			$success &= mysql_query('DROP DATABASE `'.bqSQL($dbname).'`', $link);
+		if ($dropit && ($link->exec('DROP DATABASE `'.bqSQL($dbname).'`') !== false))
+			return true;
 		return $success;
 	}