nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://repo.or.cz/srv/git/phpmyadmin/lorilee into gsoc

Browse Source 
Conflicts:
	libraries/display_export.lib.php
This commit is contained in:
lorilee
2010-07-20 15:23:12 -07:00
parent 07d68cb79f d229f6ca24
commit aa49b85fad
321 changed files with 125955 additions and 126852 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
setup/lib/config_info.inc.php
View File

@@ -40,8 +40,7 @@ $cfg_db['Servers'] = array(1 => array(
'AllowDeny' => 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['RecodingEngine'] = array('auto', 'iconv', 'recode', 'none');
$cfg_db['OBGzip'] = array('auto', true, false);
$cfg_db['ShowTooltipAliasTB'] = array('nested', true, false);
$cfg_db['DisplayDatabasesList'] = array('auto', true, false);

2
setup/lib/forms.inc.php
View File

@@ -74,8 +74,6 @@ $forms['Server_tracking'] = array('Servers' => array(1 => array(
$forms['Import_export'] = array(
'UploadDir',
'SaveDir',
'AllowAnywhereRecoding',
'DefaultCharset',
'RecodingEngine',
'IconvExtraParams',
'ZipDump',

3
setup/lib/messages.inc.php
View File

@@ -13,7 +13,6 @@ if (!function_exists('__')) {
}
$strSetupAllowAnywhereRecoding_name = __('Allow character set conversion');
$strSetupAllowArbitraryServer_desc = __('If enabled user can enter any MySQL server in login form for cookie auth');
$strSetupAllowArbitraryServerMsg = __('This [a@?page=form&formset=features#tab_Security]option[/a] should be disabled as it allows attackers to bruteforce login to any MySQL server. If you feel this is necessary, use [a@?page=form&formset=features#tab_Security]trusted proxies list[/a]. However, IP-based protection may not be reliable if your IP belongs to an ISP where thousands of users, including you, are connected to.');
$strSetupAllowArbitraryServer_name = __('Allow login to any MySQL server');
@@ -45,8 +44,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');