gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:phpmyadmin/phpmyadmin

Browse Source
This commit is contained in:
Michal Čihař 2017-06-01 14:53:13 +02:00
commit beaaed511e
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -14,6 +14,7 @@ phpMyAdmin - ChangeLog
- issue #13167 Themes now have to contain metadata in theme.json
- issue #6363 phpMyAdmin no longer requires eval() in PHP
- issue #12386 The mbstring dependency is now optional
- issue #13269 Small refactoring in preparation to CSP
4.7.2 (not yet released)

2
templates/header_location.twig
View File

@ -8,7 +8,7 @@
<meta http-equiv="Refresh" content="0;url={{ uri }}" />
<script type="text/javascript">
//<![CDATA[
setTimeout("window.location = decodeURI('{{ Sanitize_escapeJsString(uri) }}')", 2000);
setTimeout(function() { window.location = decodeURI('{{ Sanitize_escapeJsString(uri) }}'); }, 2000);
//]]>
</script>
</head>

2
test/libraries/core/PMA_headerLocation_test.php
View File

@ -117,7 +117,7 @@ class PMA_HeaderLocation_Test extends PMATestCase
. "\n <meta http-equiv=\"Cache-Control\" content=\"no-cache\" />"
. "\n <meta http-equiv=\"Refresh\" content=\"0;url=" . $testUri_html . "\" />"
. "\n <script type=\"text/javascript\">\n //<![CDATA[
setTimeout(\"window.location = decodeURI('" . $testUri_js . "')\", 2000);
setTimeout(function() { window.location = decodeURI('" . $testUri_js . "'); }, 2000);
//]]>\n </script>\n</head>
<body>\n<script type=\"text/javascript\">\n //<![CDATA[
document.write('<p><a href=\"" . $testUri_html . "\">" . __('Go') . "</a></p>');