4.2.9 release

Signed-off-by: Marc Delisle <marc@infomarc.info>
[security] XSS with malicious ENUM values

Signed-off-by: Marc Delisle <marc@infomarc.info>

Conflicts:
	libraries/Util.class.php
Bug 4544: additional fix for 4.2.x

Signed-off-by: Marc Delisle <marc@infomarc.info>
4.2.9.1 release

Signed-off-by: Marc Delisle <marc@infomarc.info>
bug #4552 Incorrect routines display for database due to case insensitive checks

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
Merge branch 'QA_4_2' into Bug4552

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
Merge branch 'MAINT_4_2_9' into QA_4_2

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
Translated using Weblate (Catalan)

Currently translated at 86.5% (2395 of 2768 strings)

[CI skip]
Translated using Weblate (German)

Currently translated at 99.2% (2746 of 2768 strings)

[CI skip]
Translated using Weblate (Turkish)

Currently translated at 100.0% (2768 of 2768 strings)

[CI skip]
Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2
Merge branch 'QA_4_2'
Translated using Weblate (Catalan)

Currently translated at 82.0% (2433 of 2965 strings)

[CI skip]
Translated using Weblate (German)

Currently translated at 98.4% (2919 of 2965 strings)

[CI skip]
Translated using Weblate (Turkish)

Currently translated at 100.0% (2965 of 2965 strings)

[CI skip]
Merge remote-tracking branch 'origin/master'
Add a ChangeLog entry for bug #3165

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
Merge branch 'master' of github.com:phpmyadmin/phpmyadmin
Revert "The DisableIS directive is removed"

This reverts commit d8fd82a9f597f7a676ebdc2ad7f7f432b7c14550.

Conflicts:
	ChangeLog
	doc/config.rst
	libraries/config.default.php
	libraries/config/messages.inc.php

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
Revert "The DisableIS directive is being deprecated"

This reverts commit 57ef25eed8b470cc521ad57d6ed5d79fc66e08e7.

Conflicts:
	test/classes/plugin/export/PMA_ExportSql_test.php

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>