diff options
author | Maurício Meneghini Fauth <mauricio@fauth.dev> | 2022-06-15 02:20:13 +0300 |
---|---|---|
committer | Maurício Meneghini Fauth <mauricio@fauth.dev> | 2022-06-15 02:20:13 +0300 |
commit | d6ee05001aedde179e7fbc7e804ee2ebaafbd936 (patch) | |
tree | 8df3010948e479c00b5c639c7d85358c679edc26 | |
parent | e87d1795c9512b15c6b9e0ea536c65a34a16f075 (diff) |
Fix error when clicking New index in sidebar
Fixes https://github.com/phpmyadmin/phpmyadmin/issues/17592
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 | 5 |
3 files changed, 5 insertions, 2 deletions
@@ -15,6 +15,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 de9e8b2b35..7949109ede 100644 --- a/templates/footer.twig +++ b/templates/footer.twig @@ -1,3 +1,4 @@ +{{ 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 679734704f..9e66a65955 100644 --- a/test/classes/FooterTest.php +++ b/test/classes/FooterTest.php @@ -7,6 +7,7 @@ namespace PhpMyAdmin\Tests; use ArrayIterator; use PhpMyAdmin\ErrorHandler; use PhpMyAdmin\Footer; +use PhpMyAdmin\Template; use function json_encode; @@ -124,7 +125,7 @@ class FooterTest extends AbstractTestCase $footer = new Footer(); $footer->setAjax(true); $this->assertEquals( - '', + (new Template())->render('modals/index_dialog_modal'), $footer->getDisplay() ); } @@ -163,7 +164,7 @@ class FooterTest extends AbstractTestCase $footer = new Footer(); $footer->setMinimal(); $this->assertEquals( - " </div>\n </body>\n</html>\n", + (new Template())->render('modals/index_dialog_modal') . " </div>\n </body>\n</html>\n", $footer->getDisplay() ); } |