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

diff -r c7093ad17858 -r ac3bd4e94555 msitegen.inc.php
--- a/msitegen.inc.php	Thu May 16 21:57:32 2019 +0300
+++ b/msitegen.inc.php	Thu May 16 21:59:44 2019 +0300
@@ -592,15 +592,13 @@
 }
 
 
-function stDBPrepareSQL($dbh)
+function stDBPrepareSQL_V($dbh, $fmt, $argv)
 {
-  $argc = func_num_args();
-  $argv = func_get_args();
-
-  $fmt = $argv[1];
   $len = strlen($fmt);
   $sql = "";
-  $argn = 2;
+  $argn = 0;
+  $argc = count($argv);
+
   for ($pos = 0; $pos < $len; $pos++)
   {
     if ($fmt[$pos] == "%")
@@ -622,34 +620,18 @@
 }
 
 
+function stDBPrepareSQL($dbh)
+{
+  $argv = func_get_args();
+  return stDBPrepareSQL_V($dbh, $argv[1], array_splice($argv, 2));
+}
+
+
 function stPrepareSQL()
 {
   global $db;
-  $argc = func_num_args();
   $argv = func_get_args();
-
-  $fmt = $argv[0];
-  $len = strlen($fmt);
-  $sql = "";
-  $argn = 1;
-  for ($pos = 0; $pos < $len; $pos++)
-  {
-    if ($fmt[$pos] == "%")
-    {
-      if ($argn < $argc)
-        $sql .= stDBGetSQLParam($db, $fmt[++$pos], $argv[$argn++]);
-      else
-      {
-        stLogError("Invalid SQL statement format string '".$fmt.
-          "', not enough parameters specified (".$argn." of ".$argc.")");
-        return FALSE;
-      }
-    }
-    else
-      $sql .= $fmt[$pos];
-  }
-
-  return $sql;
+  return stDBPrepareSQL_V($db, $argv[0], array_splice($argv, 1));
 }