From 9724f8f13bdc6bfb2f9649c54ad37fb45bea9870 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Tue, 06 Jan 2015 10:41:32 -0500
Subject: [PATCH] Merge remote-tracking branch 'ispc/master' into new-layout-3.1
---
server/lib/classes/aps_installer.inc.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/server/lib/classes/aps_installer.inc.php b/server/lib/classes/aps_installer.inc.php
index 089c7ab..fbb8079 100644
--- a/server/lib/classes/aps_installer.inc.php
+++ b/server/lib/classes/aps_installer.inc.php
@@ -376,7 +376,7 @@
setups get enough time to create the database */
if($this->handle_type == 'install') {
for($n = 1; $n < 15; $n++) {
- $link = mysql_connect($newdb_host, $newdb_login, $newdb_pw);
+ $link = mysqli_connect($newdb_host, $newdb_login, $newdb_pw);
if (!$link) {
unset($link);
sleep(5);
--
Gitblit v1.9.1