tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix/win32-set-names' into 'develop' 

Pandora's DB does not default to utf8 on win32 anymore. Thanks koichiro!

See merge request artica/pandorafms!2008
This commit is contained in:
nramon 2018-11-22 11:02:47 +01:00
parent b4f3ce251b c8f94e6756
commit 0b4b60dec9
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pandora_server/lib/PandoraFMS/DB.pm
View File

@ -131,9 +131,6 @@ sub db_connect ($$$$$$) {
# Enable character semantics # Enable character semantics
$dbh->{'mysql_enable_utf8'} = 1; $dbh->{'mysql_enable_utf8'} = 1;
# Tell the server to return UTF-8 strings.
$dbh->do("SET NAMES 'utf8';") if ($^O eq 'MSWin32');
return $dbh; return $dbh;
} }
elsif ($rdbms eq 'postgresql') { elsif ($rdbms eq 'postgresql') {