From 5d5d96f002ccac5e8a4488b35237a46c11434324 Mon Sep 17 00:00:00 2001 From: tomash Date: Thu, 14 Sep 2006 20:36:00 +0000 Subject: [PATCH] Fallback for failed recoding added. --- livesupport/src/modules/storageAdmin/var/import.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/livesupport/src/modules/storageAdmin/var/import.php b/livesupport/src/modules/storageAdmin/var/import.php index 40029f047..9f871b3ce 100644 --- a/livesupport/src/modules/storageAdmin/var/import.php +++ b/livesupport/src/modules/storageAdmin/var/import.php @@ -128,7 +128,10 @@ function addMdata($key, $val, $iEnc='iso-8859-1'){ $oEnc = 'UTF-8'; if(function_exists('iconv') && $iEnc != $oEnc){ $data = $r = @iconv($iEnc, $oEnc, $data); - if($r === FALSE) die("Recoding metadata to unicode failed."); + if($r === FALSE){ + echo "Warning: convert $key data to unicode failed\n"; + $data = $val; // fallback + } } if($key == $titleKey) $titleHaveSet = TRUE; $mdata[$key] = trim($data);