X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fdb%2Fconnect_db.inc;h=20ce648f08b2ee419530290ec7daa2949767a650;hb=3df0648d1513215ea28378e679d4291d3e609ba6;hp=e899eac786553a8d1abcb7036c3809d246111855;hpb=0b63d898491b6577a5a5bf90e771dca0dcbbcf1f;p=fa-stable.git diff --git a/includes/db/connect_db.inc b/includes/db/connect_db.inc index e899eac7..20ce648f 100644 --- a/includes/db/connect_db.inc +++ b/includes/db/connect_db.inc @@ -12,10 +12,10 @@ //$path_to_root=".."; -if (strncmp(phpversion(), "5.4", 3) >= 0) // mysql_... functions deprecated from php 5.5 +if (function_exists('mysqli_connect')) include_once("connect_db_mysqli.inc"); -else - include_once("connect_db_mysql.inc"); +else + include_once("connect_db_mysql.inc"); // use deprecated mysql_* API as fallback on old servers function db_get_version() { @@ -109,7 +109,7 @@ function db_fixed() /* Check database default charset. */ -function db_get_charset() +function db_get_default_charset() { $result = db_query("SELECT @@character_set_database"); $var = db_fetch($result);