Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 985bdd11abce22f2d01b9ce707b0a1e647b9d31e
https://github.com/phpmyadmin/phpmyadmin/commit/985bdd11abce22f2d01b9ce707b0a1e647b9d31e
Author: Michal Čihař
Date: 2015-12-28 (Mon, 28 Dec 2015)
Changed paths:
M ChangeLog
M libraries/charset_conversion.lib.php
Log Message:
---
Check whether iconv works before using it
On some systems iconv is installed, but is missing encoding definitions,
what leads to runtime errors when trying to use it. By testing this we
start using it only if it's properly working.
Fixes #11787
Signed-off-by: Michal Čihař
Commit: 671a5f7b0c1df180eb4b7f4972dac857c88383de
https://github.com/phpmyadmin/phpmyadmin/commit/671a5f7b0c1df180eb4b7f4972dac857c88383de
Author: Michal Čihař
Date: 2015-12-28 (Mon, 28 Dec 2015)
Changed paths:
M ChangeLog
M libraries/charset_conversion.lib.php
Log Message:
---
Merge branch 'QA_4_5'
Compare:
https://github.com/phpmyadmin/phpmyadmin/compare/b30e0aa19452...671a5f7b0c1d___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git
