Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: f09ead5e075175d23d370f9ad28cd3203a9cbd05 https://github.com/phpmyadmin/phpmyadmin/commit/f09ead5e075175d23d370f9ad28c... Author: William Desportes <williamdes@wdes.fr> Date: 2021-06-15 (Tue, 06 June 2021) +02:00 Changed paths: M libraries/classes/Controllers/Table/ReplaceController.php M libraries/classes/Display/Results.php M libraries/classes/InsertEdit.php M libraries/classes/Plugins.php M libraries/classes/Theme.php M libraries/classes/ThemeManager.php M libraries/classes/Transformations.php Log Message: ----------- Fix code using relative path if (chdir('/tmp') === false) { die('Could not change dir'); } Signed-off-by: William Desportes <williamdes@wdes.fr> Commit: 2232818da90a91f656be66bb32620c046cbdf6c3 https://github.com/phpmyadmin/phpmyadmin/commit/2232818da90a91f656be66bb3262... Author: William Desportes <williamdes@wdes.fr> Date: 2021-06-15 (Tue, 06 June 2021) +02:00 Changed paths: M libraries/classes/Controllers/Table/ReplaceController.php M libraries/classes/Display/Results.php M libraries/classes/InsertEdit.php M libraries/classes/Plugins.php M libraries/classes/Theme.php M libraries/classes/ThemeManager.php M libraries/classes/Transformations.php Log Message: ----------- Merge #16967 - Fix code using relative paths for themes and lib imports Signed-off-by: William Desportes <williamdes@wdes.fr> Commit: e0842506a26b96133ee47b0471546814a3b311bb https://github.com/phpmyadmin/phpmyadmin/commit/e0842506a26b96133ee47b047154... Author: William Desportes <williamdes@wdes.fr> Date: 2021-06-15 (Tue, 06 June 2021) +02:00 Changed paths: M ChangeLog Log Message: ----------- Add a ChangeLog entry for 2232818da9 Pull-request: #16967 Signed-off-by: William Desportes <williamdes@wdes.fr> Commit: 300e835edb2e9dd791089a76a753d836b4a2f6f0 https://github.com/phpmyadmin/phpmyadmin/commit/300e835edb2e9dd791089a76a753... Author: William Desportes <williamdes@wdes.fr> Date: 2021-06-16 (Wed, 06 June 2021) +02:00 Changed paths: M ChangeLog M libraries/classes/Controllers/Table/ReplaceController.php M libraries/classes/Display/Results.php M libraries/classes/InsertEdit.php M libraries/classes/Plugins.php M libraries/classes/Theme.php M libraries/classes/ThemeManager.php M libraries/classes/Transformations.php Log Message: ----------- Merge branch 'QA_5_1' Signed-off-by: William Desportes <williamdes@wdes.fr> Commit: de142e56ea71c25fb7dd242c8657e06724582ee0 https://github.com/phpmyadmin/phpmyadmin/commit/de142e56ea71c25fb7dd242c8657... Author: William Desportes <williamdes@wdes.fr> Date: 2021-06-16 (Wed, 06 June 2021) +02:00 Changed paths: M libraries/classes/Types.php Log Message: ----------- Remove useless "static" keyword in Types class See: ab9a1273ee47343dc9396670b261be6c99bd8dcb where it was used but already not made sense Signed-off-by: William Desportes <williamdes@wdes.fr> Commit: 1ca6be3f921fa2627d74b74bb7e5a52748ca6ae8 https://github.com/phpmyadmin/phpmyadmin/commit/1ca6be3f921fa2627d74b74bb7e5... Author: William Desportes <williamdes@wdes.fr> Date: 2021-06-16 (Wed, 06 June 2021) +02:00 Changed paths: M libraries/classes/ThemeManager.php Log Message: ----------- Fix wrong separator on getThemesDir for Windows on fallback mode Ref: 9444234e78447a61ac9eb6536677f9bb71122222 Signed-off-by: William Desportes <williamdes@wdes.fr> Commit: 4443570e462cd2e68a2f9c8874c32f2fe2788ec3 https://github.com/phpmyadmin/phpmyadmin/commit/4443570e462cd2e68a2f9c8874c3... Author: William Desportes <williamdes@wdes.fr> Date: 2021-06-16 (Wed, 06 June 2021) +02:00 Changed paths: M libraries/classes/Plugins.php Log Message: ----------- Remove useless dir sep from #16967 Signed-off-by: William Desportes <williamdes@wdes.fr> Commit: 66d0fecb90d8b3ccf666f29f2287a9cdeb216ada https://github.com/phpmyadmin/phpmyadmin/commit/66d0fecb90d8b3ccf666f29f2287... Author: William Desportes <williamdes@wdes.fr> Date: 2021-06-16 (Wed, 06 June 2021) +02:00 Changed paths: M libraries/classes/Plugins.php M libraries/classes/ThemeManager.php Log Message: ----------- Merge branch 'origin/QA_5_1' Signed-off-by: William Desportes <williamdes@wdes.fr> Commit: ddc5338a7487fc532a82b26e08394fda71749f44 https://github.com/phpmyadmin/phpmyadmin/commit/ddc5338a7487fc532a82b26e0839... Author: William Desportes <williamdes@wdes.fr> Date: 2021-06-16 (Wed, 06 June 2021) +02:00 Changed paths: M libraries/classes/ThemeManager.php Log Message: ----------- Fix Theme check after #16967 Signed-off-by: William Desportes <williamdes@wdes.fr> Commit: e7c2557f0245a9a618a4263115924ad22c2cf501 https://github.com/phpmyadmin/phpmyadmin/commit/e7c2557f0245a9a618a426311592... Author: William Desportes <williamdes@wdes.fr> Date: 2021-06-16 (Wed, 06 June 2021) +02:00 Changed paths: M libraries/classes/Theme.php M libraries/classes/ThemeManager.php M test/classes/AbstractTestCase.php M test/classes/ThemeTest.php Log Message: ----------- Fix Theme::load after #16967 Signed-off-by: William Desportes <williamdes@wdes.fr> Commit: 3112321d26d36ee3ef288d1a91575087c9ba0b3a https://github.com/phpmyadmin/phpmyadmin/commit/3112321d26d36ee3ef288d1a9157... Author: William Desportes <williamdes@wdes.fr> Date: 2021-06-16 (Wed, 06 June 2021) +02:00 Changed paths: M test/classes/Controllers/Table/SearchControllerTest.php Log Message: ----------- Remove static from SearchControllerTest::testGetDataRowAction Signed-off-by: William Desportes <williamdes@wdes.fr>