[php:core] fix problem auto convert encoding for quicklook

Studio-42 · Dec 8, 2016 · a17fb39 · a17fb39
1 parent 05dc47c
commit a17fb39
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/php/elFinder.class.php b/php/elFinder.class.php
@@ -2545,7 +2545,10 @@ protected function get($args) {
 					}
 					if ($enc) {
 						if ($args['conv'] == '1') {
-							$args['conv'] = $enc === 'unknown'? '' : $enc;
+							$args['conv'] = '';
+							if ($enc === 'unknown') {
+								$content = false;
+							}
 						} else if ($enc === 'unknown') {
 							return array('doconv' => $enc);
 						}