[core] RecodingEngine now accepts none as valid option.

libraries/charset_conversion.lib.php

@@ -33,14 +33,16 @@ if (isset($cfg['AllowAnywhereRecoding'])
             PMA_failRecoding();
         }
         $PMA_recoding_engine             = 'iconv';
-    } else {
+    } elseif ($cfg['RecodingEngine'] == 'auto') {
         if (@extension_loaded('iconv')) {
             $PMA_recoding_engine         = 'iconv';
         } elseif (@extension_loaded('recode')) {
             $PMA_recoding_engine         = 'recode';
         } else {
-            PMA_failRecoding();
+            $PMA_recoding_engine         = 'none';
         }
+    } else {
+        $PMA_recoding_engine         = 'none';
     }
 } // end load recode/iconv extension
 

libraries/config.default.php

@@ -1967,6 +1967,7 @@ $cfg['AllowAnywhereRecoding'] = false;
  *               recode)
  *      iconv  - use iconv or libiconv functions
  *      recode - use recode_string function
+ *      none   - disable encoding conversion
  *
  * @global string $cfg['RecodingEngine']
  */