From 337473b29af23892d2bcbe4cc97c087aa5ff8b30 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Wed, 20 Jan 2016 05:02:40 -0500
Subject: [PATCH] Merge branch 'stable-3.1'
---
install/lib/installer_base.lib.php | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index be878c1..f22a627 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -400,32 +400,32 @@
"riud",
"riud",
"",
- ' . $conf['server_id'] . ',
+ ?,
0,
- "'.$ip_type.'",
- "'.$line.'",
+ ?,
+ ?,
"y",
"80,443"
- )');
+ )', $conf['server_id'], $ip_type, $line);
$server_ip_id = $this->dbmaster->insertID();
$this->db->query('INSERT INTO server_ip (
server_php_id, sys_userid, sys_groupid, sys_perm_user, sys_perm_group,
sys_perm_other, server_id, client_id, ip_type, ip_address,
virtualhost, virtualhost_port
) VALUES (
- '.$server_ip_id.',
+ ?,
1,
1,
"riud",
"riud",
"",
- ' . $conf['server_id'] . ',
+ ?,
0,
- "'.$ip_type.'",
- "'.$line.'",
+ ?,
+ ?,
"y",
"80,443"
- )');
+ )', $server_ip_id, $conf['server_id'], $ip_type, $line);
} else {
$this->db->query('INSERT INTO server_ip (
sys_userid, sys_groupid, sys_perm_user, sys_perm_group,
@@ -437,13 +437,13 @@
"riud",
"riud",
"",
- ' . $conf['server_id'] . ',
+ ?,
0,
- "'.$ip_type.'",
- "'.$line.'",
+ ?,
+ ?,
"y",
"80,443"
- )');
+ )', $conf['server_id'], $ip_type, $line);
}
}
}
--
Gitblit v1.9.1