[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_4-5777-gd7192b3

[Michal Čihař]

The branch, master has been updated
       via  d7192b3a95bbaef2fccbd34ab57accb077085b4d (commit)
      from  df4a6efe472599ba52afac169399d2a649414ced (commit)


- Log -----------------------------------------------------------------
commit d7192b3a95bbaef2fccbd34ab57accb077085b4d
Author: Michal Čihař <mcihar at novell.com>
Date:   Tue Jul 20 11:52:33 2010 +0200

    DefaultCharset is not used anywhere.

-----------------------------------------------------------------------

Summary of changes:
 Documentation.html            |    9 ---------
 libraries/config.default.php  |   12 +-----------
 setup/lib/config_info.inc.php |    1 -
 setup/lib/forms.inc.php       |    1 -
 setup/lib/messages.inc.php    |    2 --
 5 files changed, 1 insertions(+), 24 deletions(-)

diff --git a/Documentation.html b/Documentation.html
index 427f964..63705ca 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -1683,15 +1683,6 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre>
         expression. For example if you want only Czech and English, you should
         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>
     <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
diff --git a/libraries/config.default.php b/libraries/config.default.php
index cd6ef6b..7d7d084 100644
--- a/libraries/config.default.php
+++ b/libraries/config.default.php
@@ -544,7 +544,7 @@ $cfg['SessionSavePath'] = '';
 /**
  * maximum allocated bytes ('0' for no limit)
  * 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']
  */
@@ -1951,16 +1951,6 @@ $cfg['DefaultConnectionCollation'] = 'utf8_general_ci';
 $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
  * file to make harder using other language files than Unicode.
  * Default value is false to avoid problems on servers without the iconv
diff --git a/setup/lib/config_info.inc.php b/setup/lib/config_info.inc.php
index 71a6bc5..3d95641 100644
--- a/setup/lib/config_info.inc.php
+++ b/setup/lib/config_info.inc.php
@@ -41,7 +41,6 @@ $cfg_db['Servers'] = array(1 => array(
         'order'    => array('', 'deny,allow', 'allow,deny', 'explicit')),
     'only_db'      => 'array'));
 $cfg_db['RecodingEngine'] = array('auto', 'iconv', 'recode');
-$cfg_db['DefaultCharset'] = $GLOBALS['cfg']['AvailableCharsets'];
 $cfg_db['OBGzip'] = array('auto', true, false);
 $cfg_db['ShowTooltipAliasTB'] = array('nested', true, false);
 $cfg_db['DisplayDatabasesList'] = array('auto', true, false);
diff --git a/setup/lib/forms.inc.php b/setup/lib/forms.inc.php
index ea0c87e..e60cf6f 100644
--- a/setup/lib/forms.inc.php
+++ b/setup/lib/forms.inc.php
@@ -75,7 +75,6 @@ $forms['Import_export'] = array(
     'UploadDir',
     'SaveDir',
     'AllowAnywhereRecoding',
-    'DefaultCharset',
     'RecodingEngine',
     'IconvExtraParams',
     'ZipDump',
diff --git a/setup/lib/messages.inc.php b/setup/lib/messages.inc.php
index 1defa2d..5284e03 100644
--- a/setup/lib/messages.inc.php
+++ b/setup/lib/messages.inc.php
@@ -45,8 +45,6 @@ $strSetupCompressOnFly_name = __('Compress on the fly');
 $strSetupConfigurationFile = __('Configuration file');
 $strSetupConfirm_desc = __('Whether a warning ("Are your really sure...") should be displayed when you\'re about to lose data');
 $strSetupConfirm_name = __('Confirm DROP queries');
-$strSetupDefaultCharset_desc = __('Default character set used for conversions');
-$strSetupDefaultCharset_name = __('Default character set');
 $strSetupDefaultLanguage = __('Default language');
 $strSetupDefaultServer = __('Default server');
 $strSetupDefaultTabDatabase_desc = __('Tab that is displayed when entering a database');


hooks/post-receive
-- 
phpMyAdmin