From 4055eb9162006111bd33964535a076b87d2a4d6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Tue, 4 Oct 2016 13:02:26 +0200 Subject: Refuse to work with mbstring.func_overload enabled MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In several places our code assumes that strlen does return length in bytes and not in chars. This can be different with mbstring.func_overload and will lead to several hard to debug breakages. Therefore it's safer to simply deny using phpMyAdmin with this setting. Signed-off-by: Michal Čihař --- index.php | 15 --------------- 1 file changed, 15 deletions(-) (limited to 'index.php') diff --git a/index.php b/index.php index 5fe048ab43..62c0a4d63f 100644 --- a/index.php +++ b/index.php @@ -428,21 +428,6 @@ echo ''; echo ''; -/** - * As we try to handle charsets by ourself, mbstring overloads just - * break it, see bug 1063821. - */ -if (@extension_loaded('mbstring') && @ini_get('mbstring.func_overload') > 1) { - trigger_error( - __( - 'You have enabled mbstring.func_overload in your PHP ' - . 'configuration. This option is incompatible with phpMyAdmin ' - . 'and might cause some data to be corrupted!' - ), - E_USER_WARNING - ); -} - /** * mbstring is used for handling multibytes inside parser, so it is good * to tell user something might be broken without it, see bug #1063149. -- cgit v1.2.3 From 75a5fde46dbc5e880f86d8daf4a790406dd40561 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Tue, 18 Oct 2016 11:13:22 +0200 Subject: Use secure.php.net for PHP documentation links MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This avoids unnecessary redirect on the way (I still think this website setup is weird, but that's all I can do about it). Signed-off-by: Michal Čihař --- index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'index.php') diff --git a/index.php b/index.php index 201289a07a..9bf8d6c666 100644 --- a/index.php +++ b/index.php @@ -469,7 +469,7 @@ if ($cfg['LoginCookieValidityDisableWarning'] == false) { if ($gc_time < $GLOBALS['cfg']['LoginCookieValidity'] ) { trigger_error( __( - 'Your PHP parameter [a@https://php.net/manual/en/session.' . + 'Your PHP parameter [a@https://secure.php.net/manual/en/session.' . 'configuration.php#ini.session.gc-maxlifetime@_blank]session.' . 'gc_maxlifetime[/a] is lower than cookie validity configured ' . 'in phpMyAdmin, because of this, your login might expire sooner ' . -- cgit v1.2.3