DefaultCharset is not used anywhere.

This commit is contained in:
Michal Čihař
2010-07-20 11:52:33 +02:00
parent df4a6efe47
commit d7192b3a95
5 changed files with 1 additions and 24 deletions

View File

@@ -1683,15 +1683,6 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre>
expression. For example if you want only Czech and English, you should expression. For example if you want only Czech and English, you should
set filter to <code>'^(cs|en)'</code>.</dd> set filter to <code>'^(cs|en)'</code>.</dd>
<dt id="cfg_DefaultCharset">$cfg['DefaultCharset'] string</dt>
<dd>Default character set to use for recoding of MySQL queries. This must be
enabled and it's described by
<a href="#cfg_AllowAnywhereRecoding" class="configrule">$cfg['AllowAnywhereRecoding']</a>
option.<br />
You can give here any character set which is in
<a href="#cfg_AvailableCharsets" class="configrule">$cfg['AvailableCharsets']</a>
array and this is just default choice, user can select any of them.</dd>
<dt id="cfg_AllowAnywhereRecoding">$cfg['AllowAnywhereRecoding'] boolean</dt> <dt id="cfg_AllowAnywhereRecoding">$cfg['AllowAnywhereRecoding'] boolean</dt>
<dd>Allow character set recoding of MySQL queries. You need recode or iconv <dd>Allow character set recoding of MySQL queries. You need recode or iconv
support (compiled in or module) in PHP to allow MySQL queries recoding support (compiled in or module) in PHP to allow MySQL queries recoding

View File

@@ -544,7 +544,7 @@ $cfg['SessionSavePath'] = '';
/** /**
* maximum allocated bytes ('0' for no limit) * maximum allocated bytes ('0' for no limit)
* this is a string because '16M' is a valid value; we must put here * this is a string because '16M' is a valid value; we must put here
* a string as the default value so that /setup accepts strings * a string as the default value so that /setup accepts strings
* *
* @global string $cfg['MemoryLimit'] * @global string $cfg['MemoryLimit']
*/ */
@@ -1950,16 +1950,6 @@ $cfg['DefaultConnectionCollation'] = 'utf8_general_ci';
*/ */
$cfg['FilterLanguages'] = ''; $cfg['FilterLanguages'] = '';
/**
* Default character set to use for recoding of MySQL queries, does not take
* any effect when character sets recoding is switched off by
* $cfg['AllowAnywhereRecoding'] or in language file
* (see $cfg['AvailableCharsets'] to possible choices, you can add your own)
*
* @global string $cfg['DefaultCharset']
*/
$cfg['DefaultCharset'] = 'utf-8';
/** /**
* Allow character set recoding of MySQL queries, must be also enabled in language * Allow character set recoding of MySQL queries, must be also enabled in language
* file to make harder using other language files than Unicode. * file to make harder using other language files than Unicode.

View File

@@ -41,7 +41,6 @@ $cfg_db['Servers'] = array(1 => array(
'order' => array('', 'deny,allow', 'allow,deny', 'explicit')), 'order' => array('', 'deny,allow', 'allow,deny', 'explicit')),
'only_db' => 'array')); 'only_db' => 'array'));
$cfg_db['RecodingEngine'] = array('auto', 'iconv', 'recode'); $cfg_db['RecodingEngine'] = array('auto', 'iconv', 'recode');
$cfg_db['DefaultCharset'] = $GLOBALS['cfg']['AvailableCharsets'];
$cfg_db['OBGzip'] = array('auto', true, false); $cfg_db['OBGzip'] = array('auto', true, false);
$cfg_db['ShowTooltipAliasTB'] = array('nested', true, false); $cfg_db['ShowTooltipAliasTB'] = array('nested', true, false);
$cfg_db['DisplayDatabasesList'] = array('auto', true, false); $cfg_db['DisplayDatabasesList'] = array('auto', true, false);

View File

@@ -75,7 +75,6 @@ $forms['Import_export'] = array(
'UploadDir', 'UploadDir',
'SaveDir', 'SaveDir',
'AllowAnywhereRecoding', 'AllowAnywhereRecoding',
'DefaultCharset',
'RecodingEngine', 'RecodingEngine',
'IconvExtraParams', 'IconvExtraParams',
'ZipDump', 'ZipDump',

View File

@@ -45,8 +45,6 @@ $strSetupCompressOnFly_name = __('Compress on the fly');
$strSetupConfigurationFile = __('Configuration file'); $strSetupConfigurationFile = __('Configuration file');
$strSetupConfirm_desc = __('Whether a warning (&quot;Are your really sure...&quot;) should be displayed when you\'re about to lose data'); $strSetupConfirm_desc = __('Whether a warning (&quot;Are your really sure...&quot;) should be displayed when you\'re about to lose data');
$strSetupConfirm_name = __('Confirm DROP queries'); $strSetupConfirm_name = __('Confirm DROP queries');
$strSetupDefaultCharset_desc = __('Default character set used for conversions');
$strSetupDefaultCharset_name = __('Default character set');
$strSetupDefaultLanguage = __('Default language'); $strSetupDefaultLanguage = __('Default language');
$strSetupDefaultServer = __('Default server'); $strSetupDefaultServer = __('Default server');
$strSetupDefaultTabDatabase_desc = __('Tab that is displayed when entering a database'); $strSetupDefaultTabDatabase_desc = __('Tab that is displayed when entering a database');