Merge branch 'QA_4_6' into QA_4_6-security

phpmyadmin · Aug 24, 2016 · c4714b0 · c4714b0
2 parents d5c6801 + 6879923
commit c4714b0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -10,6 +10,7 @@ phpMyAdmin - ChangeLog
 - issue        Always use UTC time in HTTP headers
 - issue #12479 Simplified validation of external links
 - issue #12483 Fix browsing tables with built in transformations
+- issue #12485 Do not show warning about short blowfish_secret if none is set
 
 4.6.4 (2016-08-16)
 - issue        [security] Weaknesses with cookie encryption, see PMASA-2016-29

diff --git a/index.php b/index.php
@@ -518,8 +518,7 @@
             ),
             E_USER_WARNING
         );
-    }
-    if (strlen($GLOBALS['cfg']['blowfish_secret']) < 32) {
+    } elseif (strlen($GLOBALS['cfg']['blowfish_secret']) < 32) {
         trigger_error(
             __(
                 'The secret passphrase in configuration (blowfish_secret) is too short.'