Revision: 2153
http://mrbs.svn.sourceforge.net/mrbs/?rev=2153&view=rev
Author: cimorrison
Date: 2011-10-31 07:34:14 +0000 (Mon, 31 Oct 2011)
Log Message:
-----------
Restricted the requirement for the iconv module to those cases when it is
really needed, ie when the server is running AIX or Windows.
Modified Paths:
--------------
mrbs/trunk/web/language.inc
Modified: mrbs/trunk/web/language.inc
===================================================================
--- mrbs/trunk/web/language.inc 2011-10-31 07:23:48 UTC (rev 2152)
+++ mrbs/trunk/web/language.inc 2011-10-31 07:34:14 UTC (rev 2153)
@@ -466,9 +466,11 @@
// Locale handling
$windows_locale = "eng";
+$server_os = get_server_os(); // used globally
// 2003/11/09 JF Larvoire: Help new admins understand what to do in case the
iconv error occurs...
-if (!function_exists('iconv'))
+if (!function_exists('iconv') &&
+ (($server_os == 'windows') || ($server_os == 'aix')) )
{
exit('
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd";>
@@ -508,8 +510,6 @@
');
}
-$server_os = get_server_os(); // used globally
-
if ($override_locale != "")
{
if (setlocale(LC_ALL,$override_locale) == FALSE)
@@ -796,9 +796,9 @@
function utf8_convert_from_locale($string)
{
- global $windows_locale, $winlocale_codepage_map;
+ global $windows_locale, $winlocale_codepage_map, $server_os;
- if (get_server_os() == "windows")
+ if ($server_os == "windows")
{
if ($winlocale_codepage_map[$windows_locale])
{
@@ -806,7 +806,7 @@
$string);
}
}
- else if (get_server_os() == "aix")
+ else if ($server_os == "aix")
{
$string = utf8_convert_aix($string);
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Get your Android app more play: Bring it to the BlackBerry PlayBook
in minutes. BlackBerry App World™ now supports Android™ Apps
for the BlackBerry® PlayBook™. Discover just how easy and simple
it is! http://p.sf.net/sfu/android-dev2dev
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
