diff options
author | Maurício Meneghini Fauth <mauricio@fauth.dev> | 2022-06-15 02:34:23 +0300 |
---|---|---|
committer | Maurício Meneghini Fauth <mauricio@fauth.dev> | 2022-06-15 02:34:23 +0300 |
commit | 0715cf6767aa9e5aa5d7391831ff3d4db1aaf081 (patch) | |
tree | 533244e504eee75a2ac453f4f7ace825f398f2fb | |
parent | 9fd483de160b1e525c4e4700a1e495d3c4467ff5 (diff) | |
parent | d6ee05001aedde179e7fbc7e804ee2ebaafbd936 (diff) |
Merge branch 'QA_5_2'
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
-rw-r--r-- | ChangeLog | 1 | ||||
-rw-r--r-- | templates/footer.twig | 1 | ||||
-rw-r--r-- | test/classes/FooterTest.php | 6 |
3 files changed, 6 insertions, 2 deletions
@@ -17,6 +17,7 @@ phpMyAdmin - ChangeLog - issue #17577 Fix monitor charts size on RTL languages - issue #17121 Fix password_hash function incorrectly adding single quotes to password before hashing - issue #17586 Fix statistics not showing for empty databases +- issue #17592 Clicking on the New index link on the sidebar does not throw an error anymore 5.2.0 (2022-05-10) - issue #16521 Upgrade Bootstrap to version 5 diff --git a/templates/footer.twig b/templates/footer.twig index 74d09e7c11..1c47f43117 100644 --- a/templates/footer.twig +++ b/templates/footer.twig @@ -1,6 +1,7 @@ {{ include('modals/function_confirm.twig') }} {{ include('modals/add_index.twig') }} {{ include('modals/page_settings.twig') }} +{{ include('modals/index_dialog_modal.twig') }} {% if not is_ajax %} </div> {% endif %} diff --git a/test/classes/FooterTest.php b/test/classes/FooterTest.php index 787d4b3919..52e2ab15e5 100644 --- a/test/classes/FooterTest.php +++ b/test/classes/FooterTest.php @@ -128,7 +128,8 @@ class FooterTest extends AbstractTestCase $this->assertEquals( $template->render('modals/function_confirm') . "\n" . $template->render('modals/add_index') . "\n" - . $template->render('modals/page_settings') . "\n", + . $template->render('modals/page_settings') . "\n" + . $template->render('modals/index_dialog_modal') . "\n", $footer->getDisplay() ); } @@ -170,7 +171,8 @@ class FooterTest extends AbstractTestCase $this->assertEquals( $template->render('modals/function_confirm') . "\n" . $template->render('modals/add_index') . "\n" - . $template->render('modals/page_settings') + . $template->render('modals/page_settings') . "\n" + . $template->render('modals/index_dialog_modal') . "\n </div>\n </body>\n</html>\n", $footer->getDisplay() ); |