From: pdontthink Date: Fri, 4 Jan 2008 04:12:12 +0000 (+0000) Subject: Comment and linguistic fixes X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=commitdiff_plain;h=aae6085487c1dca79376b459e09475b95277e592 Comment and linguistic fixes git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@12847 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- diff --git a/include/init.php b/include/init.php index 669933d8..c6bb2d23 100644 --- a/include/init.php +++ b/include/init.php @@ -391,7 +391,8 @@ do_hook('config_override', $null); * * Code can be utilized when session is started, but data is not loaded. * We have already loaded configuration and other important vars. Can't - * clean session globals here. + * clean session globals here, beside, the cleanout of globals at the + * top of this file will have removed anything this code would find anyway. if ((bool) @ini_get('register_globals') && strtolower(ini_get('register_globals'))!='off') { foreach ($_SESSION as $key => $value) { @@ -593,12 +594,9 @@ switch (PAGE_NAME) { // Japanese translation used without mbstring support if ($err==2) { - $sError = - "

You need to have PHP installed with the multibyte string function \n". - "enabled (using configure option --enable-mbstring).

\n". - "

System assumed that you accidently switched to Japanese translation \n". - "and reverted your language preference to English.

\n". - "

Please refresh this page in order to use webmail.

\n"; + $sError = "

Your administrator needs to have PHP installed with the multibyte string extension enabled (using configure option --enable-mbstring).

\n" + . "

This system has assumed that you accidently switched to Japanese and has reverted your language preference to English.

\n" + . "

Please refresh this page in order to continue using your webmail.

\n"; error_box($sError); }