Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: d78e173b34b2a318677e30900a4399b53d9b28b3 https://github.com/phpmyadmin/phpmyadmin/commit/d78e173b34b2a318677e30900a43... Author: Michal Čihař <michal@cihar.com> Date: 2016-05-27 (Fri, 27 May 2016) Changed paths: M ChangeLog M libraries/Config.php M test/classes/ConfigTest.php Log Message: ----------- Do not use dirname for calculating cookie path It is wrong for this purpose as on Windows this uses \ for both separating parts and generating result. This fixed calculation of cookie path on Windows. Fixes #12249 Signed-off-by: Michal Čihař <michal@cihar.com> Commit: ab29ec9947907acd276c4ba6ba22980988d29483 https://github.com/phpmyadmin/phpmyadmin/commit/ab29ec9947907acd276c4ba6ba22... Author: Michal Čihař <michal@cihar.com> Date: 2016-05-27 (Fri, 27 May 2016) Changed paths: M ChangeLog M libraries/Config.php M test/classes/ConfigTest.php Log Message: ----------- Merge branch 'QA_4_6' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/ba20c9fc7e39...ab29ec994790