Skip to content

Commit

Permalink
Nit.
Browse files Browse the repository at this point in the history
  • Loading branch information
kohler committed Dec 10, 2021
1 parent c92ec73 commit 4ca80d3
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions lib/dbl.php
Original file line number Diff line number Diff line change
Expand Up @@ -835,6 +835,13 @@ static function shutdown() {
self::$query_log = false;
}

/** @param ?\mysqli $dblink
* @return string */
static function utf8_charset($dblink = null) {
$dblink = $dblink ?? self::$default_dblink;
return $dblink->server_version >= 50503 ? "utf8mb4" : "utf8";
}

/** @param \mysqli|string $dblink
* @param ?string $qstr
* @return string */
Expand Down Expand Up @@ -870,13 +877,6 @@ static function convert_utf8($dblink, $qstr = null) {
$utf8 = $dblink->server_version >= 50503 ? "utf8mb4" : "utf8";
return "convert($qstr using $utf8)";
}

/** @param ?\mysqli $dblink
* @return string */
static function utf8_charset($dblink = null) {
$dblink = $dblink ?? self::$default_dblink;
return $dblink->server_version >= 50503 ? "utf8mb4" : "utf8";
}
}

// quoting for SQL
Expand Down

0 comments on commit 4ca80d3

Please sign in to comment.