Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 4590194c71de6dec4f468a696782d94aa5d594fa https://github.com/phpmyadmin/phpmyadmin/commit/4590194c71de6dec4f468a696782... Author: tiemen <thjazi39@gmail.com> Date: 2022-05-13 (Fri, 05 May 2022) +02:00 Changed paths: M po/fr.po Log Message: ----------- Translated using Weblate (French) Currently translated at 100.0% (3418 of 3418 strings) [ci skip] Translation: phpMyAdmin/5.2 Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-2/fr/ Signed-off-by: tiemen <thjazi39@gmail.com> Commit: 680e59eb5f390279d09cc071a1b951942be5d593 https://github.com/phpmyadmin/phpmyadmin/commit/680e59eb5f390279d09cc071a1b9... Author: Maurício Meneghini Fauth <mauricio@fauth.dev> Date: 2022-05-13 (Fri, 05 May 2022) -03:00 Changed paths: A test/test_data/routes/routes-invalid.cache.txt A test/test_data/routes/routes-valid.cache.txt M libraries/classes/Routing.php M test/classes/RoutingTest.php Log Message: ----------- Ignore invalid routes cache file If the `libraries/cache/routes.cache.php` file is invalid (usually from 5.1), ignores it and try to write a new one instead of failing. Fixes https://github.com/phpmyadmin/phpmyadmin/issues/17522. Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev> Commit: 3c7ce21043665fff18246f04bc80245b682d251b https://github.com/phpmyadmin/phpmyadmin/commit/3c7ce21043665fff18246f04bc80... Author: Maurício Meneghini Fauth <mauricio@fauth.dev> Date: 2022-05-13 (Fri, 05 May 2022) -03:00 Changed paths: A test/test_data/routes/routes-invalid.cache.txt A test/test_data/routes/routes-valid.cache.txt M libraries/classes/Routing.php M test/classes/RoutingTest.php Log Message: ----------- Merge pull request #17524 from MauricioFauth/routes-cache-file Ignore invalid routes cache file Fixes #17522 Commit: 2e4c69d7b4ebfdead7ba0304d14993378661f262 https://github.com/phpmyadmin/phpmyadmin/commit/2e4c69d7b4ebfdead7ba0304d149... Author: Maurício Meneghini Fauth <mauricio@fauth.dev> Date: 2022-05-13 (Fri, 05 May 2022) -03:00 Changed paths: M ChangeLog Log Message: ----------- Add ChangeLog entry for #17522 [ci-skip] Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev> Commit: 37d55ee35590ac5cb658ce4996df99ccb8349565 https://github.com/phpmyadmin/phpmyadmin/commit/37d55ee35590ac5cb658ce4996df... Author: Maurício Meneghini Fauth <mauricio@fauth.dev> Date: 2022-05-13 (Fri, 05 May 2022) -03:00 Changed paths: A test/test_data/routes/routes-invalid.cache.txt A test/test_data/routes/routes-valid.cache.txt M ChangeLog M libraries/classes/Routing.php M test/classes/RoutingTest.php Log Message: ----------- Merge branch 'QA_5_2' Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>