Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 15204ab22722c3ca33c83c18d53d7e937cb6fe91 https://github.com/phpmyadmin/phpmyadmin/commit/15204ab22722c3ca33c83c18d53d... Author: Madhura Jayaratne <madhura.cj@gmail.com> Date: 2015-08-12 (Wed, 12 Aug 2015) Changed paths: M libraries/plugins/auth/AuthenticationCookie.class.php A libraries/plugins/auth/recaptcha/ReCaptcha/ReCaptcha.php A libraries/plugins/auth/recaptcha/ReCaptcha/RequestMethod.php A libraries/plugins/auth/recaptcha/ReCaptcha/RequestMethod/Post.php A libraries/plugins/auth/recaptcha/ReCaptcha/RequestMethod/Socket.php A libraries/plugins/auth/recaptcha/ReCaptcha/RequestMethod/SocketPost.php A libraries/plugins/auth/recaptcha/ReCaptcha/RequestParameters.php A libraries/plugins/auth/recaptcha/ReCaptcha/Response.php A libraries/plugins/auth/recaptcha/autoload.php R libraries/plugins/auth/recaptcha/recaptchalib.php Log Message: ----------- Fix #11389 ReCaptcha produce deprecated messages under PHP 7 Upgrade ReCaptcha library to version 1.1.1 Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com> Commit: bcf80395097bb62cf745516eb9b4b4b1b9b29e13 https://github.com/phpmyadmin/phpmyadmin/commit/bcf80395097bb62cf745516eb9b4... Author: Marc Delisle <marc@infomarc.info> Date: 2015-08-12 (Wed, 12 Aug 2015) Changed paths: M libraries/plugins/auth/AuthenticationCookie.class.php A libraries/plugins/auth/recaptcha/ReCaptcha/ReCaptcha.php A libraries/plugins/auth/recaptcha/ReCaptcha/RequestMethod.php A libraries/plugins/auth/recaptcha/ReCaptcha/RequestMethod/Post.php A libraries/plugins/auth/recaptcha/ReCaptcha/RequestMethod/Socket.php A libraries/plugins/auth/recaptcha/ReCaptcha/RequestMethod/SocketPost.php A libraries/plugins/auth/recaptcha/ReCaptcha/RequestParameters.php A libraries/plugins/auth/recaptcha/ReCaptcha/Response.php A libraries/plugins/auth/recaptcha/autoload.php R libraries/plugins/auth/recaptcha/recaptchalib.php Log Message: ----------- Merge pull request #11390 from madhuracj/recaptcha Fix #11389 ReCaptcha produce deprecated messages under PHP 7 Commit: 5bf03ef3e728917f6532f30302ed3ab7d5dda16e https://github.com/phpmyadmin/phpmyadmin/commit/5bf03ef3e728917f6532f30302ed... Author: Marc Delisle <marc@infomarc.info> Date: 2015-08-12 (Wed, 12 Aug 2015) Changed paths: M libraries/plugins/auth/AuthenticationCookie.class.php A libraries/plugins/auth/recaptcha/ReCaptcha/ReCaptcha.php A libraries/plugins/auth/recaptcha/ReCaptcha/RequestMethod.php A libraries/plugins/auth/recaptcha/ReCaptcha/RequestMethod/Post.php A libraries/plugins/auth/recaptcha/ReCaptcha/RequestMethod/Socket.php A libraries/plugins/auth/recaptcha/ReCaptcha/RequestMethod/SocketPost.php A libraries/plugins/auth/recaptcha/ReCaptcha/RequestParameters.php A libraries/plugins/auth/recaptcha/ReCaptcha/Response.php A libraries/plugins/auth/recaptcha/autoload.php R libraries/plugins/auth/recaptcha/recaptchalib.php Log Message: ----------- Fix merge conflict Signed-off-by: Marc Delisle <marc@infomarc.info> Compare: https://github.com/phpmyadmin/phpmyadmin/compare/e13e30e17278...5bf03ef3e728