Branch: refs/heads/QA_4_7
Home:
https://github.com/phpmyadmin/phpmyadmin
Commit: d45e61efc596ae11ca4f0699a8a3efaaa0d10f23
https://github.com/phpmyadmin/phpmyadmin/commit/d45e61efc596ae11ca4f0699a8a…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2017-06-15 (Thu, 15 Jun 2017)
Changed paths:
M ChangeLog
M libraries/Config.php
Log Message:
-----------
Avoid PHP errors with non existing configuration on OS X
It sems that @ does notwork on fileperms there according to error
reports.
Fixes #13386
Signed-off-by: Michal Čihař <michal(a)cihar.com>
Commit: 14f738c262296f4fabf45f9db47ea22adc3c6d1a
https://github.com/phpmyadmin/phpmyadmin/commit/14f738c262296f4fabf45f9db47…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2017-06-15 (Thu, 15 Jun 2017)
Changed paths:
M ChangeLog
M libraries/Encoding.php
M libraries/display_export.lib.php
M libraries/display_import.lib.php
M test/classes/EncodingTest.php
Log Message:
-----------
Show only supported charsets for conversion
Fixes #13388
Signed-off-by: Michal Čihař <michal(a)cihar.com>
Compare:
https://github.com/phpmyadmin/phpmyadmin/compare/2dee421a7282...14f738c26229