Merge remote branch 'origin/master'

This commit is contained in:
ninadsp
2010-06-03 22:34:52 +05:30
120 changed files with 40225 additions and 32460 deletions

View File

@@ -1,7 +1,7 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
* Alter one or more table columns/fields
* Alter one or more table columns
*
* linked from table_structure, uses libraries/tbl_properties.inc.php to display
* form and handles this form data
@@ -169,7 +169,7 @@ if ($abort == false) {
*/
for ($i = 0; $i < $selected_cnt; $i++) {
$_REQUEST['field'] = PMA_sqlAddslashes($selected[$i], true);
$result = PMA_DBI_query('SHOW FULL FIELDS FROM ' . PMA_backquote($table) . ' FROM ' . PMA_backquote($db) . ' LIKE \'' . $_REQUEST['field'] . '\';');
$result = PMA_DBI_query('SHOW FULL COLUMNS FROM ' . PMA_backquote($table) . ' FROM ' . PMA_backquote($db) . ' LIKE \'' . $_REQUEST['field'] . '\';');
$fields_meta[] = PMA_DBI_fetch_assoc($result);
PMA_DBI_free_result($result);
}