Merge branch 'QA_3_5'

2012-04-09 16:36:06 +02:00 · 2012-04-09 16:36:06 +02:00 · dcec810564
commit dcec810564
parent dd5aae9a67 01b6b8f613
2 changed files with 3 additions and 0 deletions
--- a/1
+++ b/1
@ -31,6 +31,7 @@ phpMyAdmin - ChangeLog
 - bug #3514490 [auth] Multiple Navigation panels bug still present
 - bug #3515181 [users] Error in create user + underscore + create database
 - bug #3515666 [display] Profiling chart shows wrong data
+- bug #3516037 [auth] JS includes missing in auth config error page

 3.5.0.0 (2012-04-07)
 + rfe #2021981 [interface] Add support for mass prefix change.
--- a/libraries/auth/config.auth.lib.php
+++ b/libraries/auth/config.auth.lib.php
@ -77,7 +77,9 @@ function PMA_auth_fails()
    /* HTML header */
    $page_title = __('Access denied');
    include './libraries/header_meta_style.inc.php';
+    include './libraries/header_scripts.inc.php';
    ?>
+
 </head>

 <body>