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:02:04 +0300
committerMichal Čihař <michal@cihar.com>2016-08-24 13:03:22 +0300
commit6879923acc50842029541f6602a54b3600df6e34 (patch)
tree597753a054534c78be727bf2b7037b064b5eb3e8 /index.php
parentcbd6137c03a7cf0db7b361bf34656e4c046d863b (diff)
Do not show warning about short blowfish_secret if none is set
With empty blowfish_secret user would always get both warnings... Fixes #12485 Signed-off-by: Michal Čihař <michal@cihar.com>
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 b72ff51b8c..5fe048ab43 100644
--- a/index.php
+++ b/index.php
@@ -518,8 +518,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.'