The branch, master has been updated via 11937b06bd1bffc24cacd0f45d2ce749387c4574 (commit) via 5f9c187010dcf2b51bf3dee516789b6fae9f2363 (commit) from 4a80c3e62d070d18ce12cc9bcf29d753e3eecef1 (commit)
- Log ----------------------------------------------------------------- commit 11937b06bd1bffc24cacd0f45d2ce749387c4574 Merge: 4a80c3e62d070d18ce12cc9bcf29d753e3eecef1 5f9c187010dcf2b51bf3dee516789b6fae9f2363 Author: Michal Čihař mcihar@suse.cz Date: Fri Jul 22 15:19:59 2011 +0200
Merge remote-tracking branch 'origin/QA_3_4'
-----------------------------------------------------------------------
Summary of changes: setup/lib/index.lib.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/setup/lib/index.lib.php b/setup/lib/index.lib.php index 04fdfd1..9823cbd 100644 --- a/setup/lib/index.lib.php +++ b/setup/lib/index.lib.php @@ -264,7 +264,7 @@ function perform_config_checks() $strLoginCookieValidityWarning3 = __('If using cookie authentication and %sLogin cookie store%s is not 0, %sLogin cookie validity%s must be set to a value less or equal to it.'); $strLoginCookieValidityWarning3 = sprintf($strLoginCookieValidityWarning3, '[a@?page=form&formset=Features#tab_Security]', '[/a]', '[a@?page=form&formset=Features#tab_Security]', '[/a]'); $strSecurityInfoMsg = __('If you feel this is necessary, use additional protection settings - %shost authentication%s settings and %strusted proxies list%s. However, IP-based protection may not be reliable if your IP belongs to an ISP where thousands of users, including you, are connected to.'); - $strSecurityInfoMsg = sprintf($strSecurityInfoMsg, '[a@?page=servers&mode=edit&id=%1$d#tab_Server_config]', '[/a]', '[a@?page=form&formset=Features#tab_Security]', '%s'); + $strSecurityInfoMsg = sprintf($strSecurityInfoMsg, '[a@?page=servers&mode=edit&id=%1$d#tab_Server_config]', '[/a]', '[a@?page=form&formset=Features#tab_Security]', '[/a]'); $strServerAuthConfigMsg = __('You set the [kbd]config[/kbd] authentication type and included username and password for auto-login, which is not a desirable option for live hosts. Anyone who knows or guesses your phpMyAdmin URL can directly access your phpMyAdmin panel. Set %sauthentication type%s to [kbd]cookie[/kbd] or [kbd]http[/kbd].'); $strServerAuthConfigMsg = sprintf($strServerAuthConfigMsg, '[a@?page=servers&mode=edit&id=%1$d#tab_Server]', '[/a]'); $strZipDumpExportWarning = __('%sZip compression%s requires functions (%s) which are unavailable on this system.');
hooks/post-receive