nupplaPhil/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Avoid problems with better variable naming

Browse source
This commit is contained in:
Michael 2018-05-24 21:46:57 +00:00
parent 1bce39120d
commit f8230badba
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
include/dba.php
View file

@ -449,23 +449,23 @@ echo "1";
break; break;
} }
$params = ''; $param_types = '';
$values = []; $values = [];
foreach ($args AS $param => $value) { foreach ($args AS $param => $value) {
if (is_int($args[$param])) { if (is_int($args[$param])) {
$params .= 'i'; $param_types .= 'i';
} elseif (is_float($args[$param])) { } elseif (is_float($args[$param])) {
$params .= 'd'; $param_types .= 'd';
} elseif (is_string($args[$param])) { } elseif (is_string($args[$param])) {
$params .= 's'; $param_types .= 's';
} else { } else {
$params .= 'b'; $param_types .= 'b';
} }
$values[] = &$args[$param]; $values[] = &$args[$param];
} }
if (count($values) > 0) { if (count($values) > 0) {
array_unshift($values, $params); array_unshift($values, $param_types);
call_user_func_array([$stmt, 'bind_param'], $values); call_user_func_array([$stmt, 'bind_param'], $values);
} }
@ -488,7 +488,7 @@ echo "1";
$errorno = self::$errorno; $errorno = self::$errorno;
logger('DB Error '.self::$errorno.': '.self::$error."\n". 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. // On a lost connection we try to reconnect - but only once.
if ($errorno == 2006) { if ($errorno == 2006) {
@ -500,7 +500,7 @@ echo "1";
// We try it again // We try it again
logger('Reconnected after database error '.$errorno.': '.$error); logger('Reconnected after database error '.$errorno.': '.$error);
self::$in_retrial = true; self::$in_retrial = true;
return self::p($sql, $params); return self::p($sql, $args);
} }
} }