From 3bfab3b99c5098e802b10a1d442c330af3524249 Mon Sep 17 00:00:00 2001
From: till <till@php.net>
Date: Mon, 26 May 2008 06:11:19 -0400
Subject: [PATCH] fix to #1485083
---
program/include/main.inc | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/program/include/main.inc b/program/include/main.inc
index 5960791..a9c8ccb 100644
--- a/program/include/main.inc
+++ b/program/include/main.inc
@@ -279,7 +279,11 @@
if (function_exists('iconv') && $from != 'UTF-7' && $to != 'UTF-7')
{
$aliases['GB2312'] = 'GB18030';
- return iconv(($aliases[$from] ? $aliases[$from] : $from), ($aliases[$to] ? $aliases[$to] : $to) . "//IGNORE", $str);
+ $_iconv = iconv(($aliases[$from] ? $aliases[$from] : $from), ($aliases[$to] ? $aliases[$to] : $to) . "//IGNORE", $str);
+ if ($_iconv !== false)
+ {
+ return $_iconv;
+ }
}
// settings for mbstring module (by Tadashi Jokagi)
--
Gitblit v1.9.1