projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Small correction to last cleanups.
[fa-stable.git]
/
includes
/
db
/
connect_db_mysqli.inc
diff --git
a/includes/db/connect_db_mysqli.inc
b/includes/db/connect_db_mysqli.inc
index 1f5dd6549914bfc16d60493c3dd0ca54bbd19627..c5c1d69b761ff3814ee1eeb6a032503bc8c597b8 100644
(file)
--- a/
includes/db/connect_db_mysqli.inc
+++ b/
includes/db/connect_db_mysqli.inc
@@
-193,7
+193,7
@@
function db_create_db($connection)
if (!mysqli_select_db($db, $connection["dbname"]))
{
$sql = "CREATE DATABASE IF NOT EXISTS " . $connection["dbname"] . "";
if (!mysqli_select_db($db, $connection["dbname"]))
{
$sql = "CREATE DATABASE IF NOT EXISTS " . $connection["dbname"] . "";
- if (!mysqli_query($sql) || !mysqli_select_db($db, $connection["dbname"]))
+ if (!mysqli_query($
db, $
sql) || !mysqli_select_db($db, $connection["dbname"]))
return 0;
}
return $db;
return 0;
}
return $db;
@@
-264,4
+264,14
@@
function db_set_encoding($ui_encoding=null)
mysqli_set_charset($db, $mysql_enc);
}
mysqli_set_charset($db, $mysql_enc);
}
-?>
\ No newline at end of file
+function db_get_charset($db)
+{
+ return mysqli_character_set_name($db);
+}
+
+function db_set_charset($db, $charset)
+{
+ global $db;
+
+ return mysqli_set_charset($db, $charset);
+}