fixed that iconv workaround

splitbrain · splitbrain · commit 735029407f33 · 2017-03-03T15:44:46.000+01:00
had a little logic error there - need to preserve the original string to
retry the encoding a second time
diff --git a/src/Zip.php b/src/Zip.php
@@ -655,9 +655,9 @@ protected function utf8ToCp($string)
     {
         // try iconv first
         if (function_exists('iconv')) {
-            $string = @iconv('UTF-8', 'CP437//IGNORE', $string);
+            $conv = @iconv('UTF-8', 'CP437//IGNORE', $string);
+            if($conv) return $conv; // it worked
         }
-        if($string) return $string; // it worked
 
         // still here? iconv failed to convert the string. Try another method
         // see http://php.net/manual/en/function.iconv.php#108643

Original file line number	Diff line number	Diff line change
`@@ -655,9 +655,9 @@ protected function utf8ToCp($string)`
`655`	`655`	`{`
`656`	`656`	`// try iconv first`
`657`	`657`	`if (function_exists('iconv')) {`
`658`		`- $string = @iconv('UTF-8', 'CP437//IGNORE', $string);`
	`658`	`+ $conv = @iconv('UTF-8', 'CP437//IGNORE', $string);`
	`659`	`+ if($conv) return $conv; // it worked`
`659`	`660`	`}`
`660`		`- if($string) return $string; // it worked`
`661`	`661`
`662`	`662`	`// still here? iconv failed to convert the string. Try another method`
`663`	`663`	`// see http://php.net/manual/en/function.iconv.php#108643`