lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #8528 from hregis/7.0_bug6

Browse Source 
FIX avoid Error: Call to undefined method mysqli::get_charset()
This commit is contained in:
Laurent Destailleur 2018-04-11 13:19:33 +02:00 committed by GitHub
commit 73aa34dfbe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/install/upgrade.php
View File

@ -183,7 +183,7 @@ if (! GETPOST('action','aZ09') || preg_match('/upgrade/i',GETPOST('action','aZ09
print '<tr><td>'.$langs->trans("ServerVersion").'</td>'; print '<tr><td>'.$langs->trans("ServerVersion").'</td>';
print '<td align="right">'.$version.'</td></tr>'; print '<td align="right">'.$version.'</td></tr>';
dolibarr_install_syslog("upgrade: " . $langs->transnoentities("ServerVersion") . ": " .$version); dolibarr_install_syslog("upgrade: " . $langs->transnoentities("ServerVersion") . ": " .$version);
if ($db->type == 'mysqli') if ($db->type == 'mysqli' && function_exists('mysqli_get_charset'))
{ {
$tmparray = $db->db->get_charset(); $tmparray = $db->db->get_charset();
print '<tr><td>'.$langs->trans("ClientCharset").'</td>'; print '<tr><td>'.$langs->trans("ClientCharset").'</td>';