Avoid problems with better variable naming

diff --git a/include/dba.php b/include/dba.php
index 88f298ec9b2361be2d8ea558752f157e5425912b..7861437834ae2ff12eea41f557954f7628fbc53a 100644 (file)
--- a/include/dba.php
+++ b/include/dba.php
@@ -449,23 +449,23 @@ echo "1";
                                        break;
                                }
 
-                               $params = '';
+                               $param_types = '';
                                $values = [];
                                foreach ($args AS $param => $value) {
                                        if (is_int($args[$param])) {
-                                               $params .= 'i';
+                                               $param_types .= 'i';
                                        } elseif (is_float($args[$param])) {
-                                               $params .= 'd';
+                                               $param_types .= 'd';
                                        } elseif (is_string($args[$param])) {
-                                               $params .= 's';
+                                               $param_types .= 's';
                                        } else {
-                                               $params .= 'b';
+                                               $param_types .= 'b';
                                        }
                                        $values[] = &$args[$param];
                                }
 
                                if (count($values) > 0) {
-                                       array_unshift($values, $params);
+                                       array_unshift($values, $param_types);
                                        call_user_func_array([$stmt, 'bind_param'], $values);
                                }
 
@@ -488,7 +488,7 @@ echo "1";
                        $errorno = self::$errorno;
 
                        logger('DB Error '.self::$errorno.': '.self::$error."\n".
-                               System::callstack(8)."\n".self::replaceParameters($sql, $params));
+                               System::callstack(8)."\n".self::replaceParameters($sql, $args));
 
                        // On a lost connection we try to reconnect - but only once.
                        if ($errorno == 2006) {
@@ -500,7 +500,7 @@ echo "1";
                                        // We try it again
                                        logger('Reconnected after database error '.$errorno.': '.$error);
                                        self::$in_retrial = true;
-                                       return self::p($sql, $params);
+                                       return self::p($sql, $args);
                                }
                        }