Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: b2b3886e22f3df54e78084cecb255bbe5ea509f3 https://github.com/phpmyadmin/phpmyadmin/commit/b2b3886e22f3df54e78084cecb2… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-07-18 (Tue, 18 Jul 2017) Changed paths: M ChangeLog M libraries/common.inc.php Log Message: ----------- Fail if ini_set/ini_get are disabled We might support operation without these two later, but it's quite a lot of work and nobody was really requesting this. Fixes #13471 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 85f5fd4bd6b6a349aa84c8a6eadeab9c2abe2c85 https://github.com/phpmyadmin/phpmyadmin/commit/85f5fd4bd6b6a349aa84c8a6ead… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-07-18 (Tue, 18 Jul 2017) Changed paths: M ChangeLog M libraries/common.inc.php Log Message: ----------- Merge branch 'QA_4_7' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/d15da74edaf0...85f5fd4bd6b6