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

Fix merge conflict

Browse Source
This commit is contained in:
Marc Delisle 2013-05-17 12:42:58 -04:00
commit 51b7426263
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -12,6 +12,7 @@ phpMyAdmin - ChangeLog
+ rfe #1412 Creating a view from an empty set of results
+ Improved layout on db and table operations pages
+ rfe #1410 Added support for AES_ENCRYPT for blob fields
+ rfe #1423 Clarify option text for icon/text settings
4.0.2.0 (not yet released)
- bug #3902 Cannot browse when table name contains keyword "call"

8
libraries/config.values.php
View File

@ -46,8 +46,8 @@ $cfg_db['NavigationTreeDefaultTabTable'] = array(
$cfg_db['NavigationTreeDbSeparator'] = 'short_string';
$cfg_db['NavigationTreeTableSeparator'] = 'short_string';
$cfg_db['NavigationBarIconic'] = array(
true => __('Yes'),
false => __('No'),
true => __('Icons'),
false => __('Text'),
'both' => __('Both')
);
$cfg_db['Order'] = array('ASC', 'DESC', 'SMART');
@ -61,8 +61,8 @@ $cfg_db['ProtectBinary'] = array(false, 'blob', 'noblob', 'all');
$cfg_db['DefaultDisplay'] = array('horizontal', 'vertical', 'horizontalflipped');
$cfg_db['CharEditing'] = array('input', 'textarea');
$cfg_db['PropertiesIconic'] = array(
true => __('Yes'),
false => __('No'),
true => __('Icons'),
false => __('Text'),
'both' => __('Both')
);
$cfg_db['GridEditing'] = array(