Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Čihař <michal@cihar.com>2016-08-24 13:03:37 +0300
committerMichal Čihař <michal@cihar.com>2016-08-24 13:03:37 +0300
commit8d46edc4b6fd6028e0942e37685be537defde17f (patch)
treecaf5dde2c2f0c4ee692d927e51c1ee34374f7ce7 /index.php
parent31f6d76405154fc6b2b67acb026cad016e172914 (diff)
parent6879923acc50842029541f6602a54b3600df6e34 (diff)
Merge branch 'QA_4_6'
Diffstat (limited to 'index.php')
-rw-r--r--index.php3
1 files changed, 1 insertions, 2 deletions
diff --git a/index.php b/index.php
index c2a5a1d19c..c5ac1a1837 100644
--- a/index.php
+++ b/index.php
@@ -522,8 +522,7 @@ if (! empty($_SESSION['encryption_key'])) {
),
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.'