Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 4055eb9162006111bd33964535a076b87d2a4d6f https://github.com/phpmyadmin/phpmyadmin/commit/4055eb9162006111bd33964535a0... Author: Michal Čihař <michal@cihar.com> Date: 2016-10-04 (Tue, 04 Oct 2016) Changed paths: M ChangeLog M index.php M libraries/common.inc.php Log Message: ----------- Refuse to work with mbstring.func_overload enabled In several places our code assumes that strlen does return length in bytes and not in chars. This can be different with mbstring.func_overload and will lead to several hard to debug breakages. Therefore it's safer to simply deny using phpMyAdmin with this setting. Signed-off-by: Michal Čihař <michal@cihar.com> Commit: d47956461f375baf6d9ef99989c8c8fdf47af553 https://github.com/phpmyadmin/phpmyadmin/commit/d47956461f375baf6d9ef99989c8... Author: Michal Čihař <michal@cihar.com> Date: 2016-10-17 (Mon, 17 Oct 2016) Changed paths: M ChangeLog M index.php M libraries/common.inc.php Log Message: ----------- Merge remote-tracking branch 'origin/pull/12616' into QA_4_6 Commit: 4311ea09d9f11d7b70b83c5842b03e959a4e811a https://github.com/phpmyadmin/phpmyadmin/commit/4311ea09d9f11d7b70b83c5842b0... Author: Michal Čihař <michal@cihar.com> Date: 2016-10-17 (Mon, 17 Oct 2016) Changed paths: M ChangeLog M index.php M libraries/common.inc.php Log Message: ----------- Merge branch 'QA_4_6' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/62b6e640fccb...4311ea09d9f1