Better conversion of data

molotovbliss · Sep 17, 2014 · 4aa602d · 4aa602d
1 parent 2da7df9
commit 4aa602d
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/app/code/core/Mage/Oscommerce/Model/Mysql4/Oscommerce.php b/app/code/core/Mage/Oscommerce/Model/Mysql4/Oscommerce.php
@@ -2038,17 +2038,17 @@ public function convert($data, array $notIncludedFields = array())
             if (is_array($data)) {
                 foreach($data as $field => $value) {
                     if (!in_array($field, $notIncludedFields)) {
-                        $newValue = @iconv($charset, self::DEFAULT_FIELD_CHARSET, $value);
-                        if (strlen($newValue)) {
-                            $data[$field] = $newValue;
-                        }
+                        if (@iconv($charset, self::DEFAULT_FIELD_CHARSET, $value) !== FALSE)
+                            $data[$field] = @iconv($charset, self::DEFAULT_FIELD_CHARSET, $value);
+                        else
+                            $data[$field] = $value;
                     }
                 }
             } else {
-                $newValue = @iconv($charset, self::DEFAULT_MAGENTO_CHARSET, $data);
-                if (strlen($newValue)) {
-                    $data = $newValue;
-                }
+                if (@iconv($charset, self::DEFAULT_MAGENTO_CHARSET, $data) !== FALSE)
+                    $data = @iconv($charset, self::DEFAULT_MAGENTO_CHARSET, $data);
+                else
+                    $data = $data;
             }
         }
         return $data;