# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1558033184 -10800
# Node ID ac3bd4e94555b25a2d15ab7d80f0b9495af32d60
# Parent  c7093ad1785807a4fbdd9704bf24a31cf0104fbb# Parent  acb65ff40ce1ac3aca83511f58c517597bb20a29
Merge.

diff -r acb65ff40ce1 -r ac3bd4e94555 msitegen.inc.php
--- a/msitegen.inc.php	Thu May 16 12:44:17 2019 +0300
+++ b/msitegen.inc.php	Thu May 16 21:59:44 2019 +0300
@@ -546,21 +546,6 @@
 }
 
 
-function stDBGetSQLParam($dbh, $type, $value)
-{
-  switch ($type)
-  {
-    case "d": return intval($value);
-    case "s": return $dbh->quote($value);
-    case "b": return intval($value) ? 1 : 0;
-    case "D": return intval(stGetRequestItem($value));
-    case "S": return $dbh->quote(stGetRequestItem($value));
-    case "Q": return $dbh->quote(stGetRequestItem($value));
-    case "B": return intval(stGetRequestItem($value)) ? 1 : 0;
-  }
-}
-
-
 function stConnectSQLDB()
 {
   global $db;
@@ -574,11 +559,25 @@
     stLogError("Could not connect to SQL database: ".$e->getMessage().".");
     return FALSE;
   }
-  $db = stConnectSQLDBSpec(stGetSetting("sqlDB"));
   return ($db !== FALSE);
 }
 
 
+function stDBGetSQLParam($dbh, $type, $value)
+{
+  switch ($type)
+  {
+    case "d": return intval($value);
+    case "s": return $dbh->quote($value);
+    case "b": return intval($value) ? 1 : 0;
+    case "D": return intval(stGetRequestItem($value));
+    case "S": return $dbh->quote(stGetRequestItem($value));
+    case "Q": return $dbh->quote(stGetRequestItem($value));
+    case "B": return intval(stGetRequestItem($value)) ? 1 : 0;
+  }
+}
+
+
 function stDBPrepareSQLUpdate($dbh, $table, $cond, $pairs, $values = NULL)
 {
   $sql = [];