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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Pootle server 2011-09-02 16:40:17 +02:00
commit f30bf0681b
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libraries/database_interface.lib.php
View File

@ -1063,7 +1063,7 @@ function PMA_DBI_get_columns($database, $table, $column = null, $full = false, $
}
/**
* Returns SQL for fetching informatin on table indexes (SHOW INDEXES)
* Returns SQL for fetching information on table indexes (SHOW INDEXES)
*
* @param string $database name of database
* @param string $table name of the table whose indexes are to be retreived
@ -1104,10 +1104,10 @@ function PMA_DBI_get_table_indexes_sql($database, $table, $where = null)
}
/**
* Returns indexes od a table
* Returns indexes of a table
*
* @param string $database name of database
* @param string $table name of the table whose indexes are to be retreived
* @param string $table name of the table whose indexes are to be retrieved
* @param mixed $link mysql link resource
* @return array $indexes
*/

4
tbl_change.php
View File

@ -458,6 +458,10 @@ foreach ($rows as $row_id => $vrow) {
if (-1 === $field['len']) {
$field['len'] = PMA_DBI_field_len($vresult, $i);
// length is unknown for geometry fields, make enough space to edit very simple WKTs
if (-1 === $field['len']) {
$field['len'] = 30;
}
}
//Call validation when the form submited...
$unnullify_trigger = $chg_evt_handler . "=\"return verificationsAfterFieldChange('". PMA_escapeJsString($field['Field_md5']) . "', '"