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

Merge remote branch 'origin/master'

Browse Source
This commit is contained in:
Pootle server 2011-02-08 22:40:05 +01:00
commit 109a9fa99a
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -135,6 +135,7 @@
- [interface] Default to not count tables in database.
- patch #3172172 [interface] Shortcut for copying table row.
- bug #3175227 [auth] Reset user cache on login.
- rfe #3148361 [interface] Replace hard coded limit with $cfg['LimitChars'].
3.3.10.0 (not yet released)
- patch #3147400 [structure] Aria table size printed as unknown,

10
tbl_change.php
View File

@ -387,7 +387,7 @@ foreach ($rows as $row_id => $vrow) {
|| stripos($table_fields[$i]['Type'], 'varbinary') === 0) {
$table_fields[$i]['is_binary'] = stristr($table_fields[$i]['Type'], 'binary');
} else {
$table_fields[$i]['is_binary'] = false;
$table_fields[$i]['is_binary'] = false;
}
// If check to ensure types such as "enum('one','two','blob',..)" or
@ -398,7 +398,7 @@ foreach ($rows as $row_id => $vrow) {
|| stripos($table_fields[$i]['Type'], 'longblob') === 0) {
$table_fields[$i]['is_blob'] = stristr($table_fields[$i]['Type'], 'blob');
} else {
$table_fields[$i]['is_blob'] = false;
$table_fields[$i]['is_blob'] = false;
}
// If check to ensure types such as "enum('one','two','char',..)" or
@ -407,7 +407,7 @@ foreach ($rows as $row_id => $vrow) {
|| stripos($table_fields[$i]['Type'], 'varchar') === 0) {
$table_fields[$i]['is_char'] = stristr($table_fields[$i]['Type'], 'char');
} else {
$table_fields[$i]['is_char'] = false;
$table_fields[$i]['is_char'] = false;
}
$table_fields[$i]['first_timestamp'] = false;
@ -899,8 +899,8 @@ foreach ($rows as $row_id => $vrow) {
<?php
} else {
// field size should be at least 4 and max 40
$fieldsize = min(max($field['len'], 4), 40);
// field size should be at least 4 and max $cfg['LimitChars']
$fieldsize = min(max($field['len'], 4), $cfg['LimitChars']);
echo "\n";
echo $backup_field . "\n";
?>