diff --git a/ChangeLog b/ChangeLog index 07482ab1d..22addcf2e 100755 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,8 @@ $Source$ 2004-10-25 Michal Čihař * libraries/common.lib.php: Fix URI detection in case REQUEST_URI contains full URI (patch #1044123). + * tbl_properties_structure.php, libraries/display_tbl.lib.php: Fix typo + that broke multi submits for MSIE (bug #1052674). 2004-10-24 Michael Keck * config.inc.php, themes/*/layout.inc.php: diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index f194ad85d..f220cce93 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -460,7 +460,7 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $ if (isset($analyzed_sql[0]['unsorted_query'])) { $unsorted_sql_query = $analyzed_sql[0]['unsorted_query']; } - + // we need $sort_expression and $sort_expression_nodir // even if there are many table references @@ -489,7 +489,7 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $ } $prev_index = ''; - foreach ($ret_keys as $row) { + foreach ($ret_keys as $row) { if ($row['Key_name'] != $prev_index ){ $indexes[] = $row['Key_name']; @@ -692,9 +692,9 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $ if ($GLOBALS['cfg']['ShowBrowseComments'] && $GLOBALS['cfgRelation']['commwork'] && $disp_direction != 'horizontalflipped') { $comments_map = array(); foreach ($analyzed_sql[0]['table_ref'] as $tbl) { - + $tb = $tbl['table_true_name']; - + $comments_map[$tb] = PMA_getComments($db, $tb); } } @@ -736,7 +736,7 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $ } // 2.0 Prepare comment-HTML-wrappers for each row, if defined/enabled. - if (isset($comments_map) && + if (isset($comments_map) && isset($comments_map[$fields_meta[$i]->table]) && isset($comments_map[$fields_meta[$i]->table][$fields_meta[$i]->name])) { /*$comments_table_wrap_pre = '
'; @@ -1867,10 +1867,10 @@ function PMA_displayTable(&$dt_result, &$the_disp_mode, $analyzed_sql) echo '  ' . $GLOBALS['strWithChecked'] . ''. "\n"; if ($cfg['PropertiesIconic']) { - PMA_buttonOrImage('submit_mult', 'mult_submit', 'submin_mult_change', $GLOBALS['strChange'], 'b_edit.png'); - PMA_buttonOrImage('submit_mult', 'mult_submit', 'submin_mult_change', $delete_text, 'b_drop.png'); + PMA_buttonOrImage('submit_mult', 'mult_submit', 'submit_mult_change', $GLOBALS['strChange'], 'b_edit.png'); + PMA_buttonOrImage('submit_mult', 'mult_submit', 'submit_mult_change', $delete_text, 'b_drop.png'); if ($analyzed_sql[0]['querytype'] == 'SELECT') { - PMA_buttonOrImage('submit_mult', 'mult_submit', 'submin_mult_change', $GLOBALS['strExport'], 'b_tblexport.png'); + PMA_buttonOrImage('submit_mult', 'mult_submit', 'submit_mult_change', $GLOBALS['strExport'], 'b_tblexport.png'); } echo "\n"; } else { diff --git a/tbl_properties_structure.php b/tbl_properties_structure.php index 142f0d718..05aa7da5b 100644 --- a/tbl_properties_structure.php +++ b/tbl_properties_structure.php @@ -419,16 +419,16 @@ $checkall_url = 'tbl_properties_structure.php?' . PMA_generate_common_url($db,$t 1) { - PMA_buttonOrImage('submit_mult', 'mult_submit', 'submin_mult_drop', $strDrop, 'b_drop.png'); + PMA_buttonOrImage('submit_mult', 'mult_submit', 'submit_mult_drop', $strDrop, 'b_drop.png'); } - PMA_buttonOrImage('submit_mult', 'mult_submit', 'submin_mult_primary', $strPrimary, 'b_primary.png'); - PMA_buttonOrImage('submit_mult', 'mult_submit', 'submin_mult_index', $strIndex, 'b_index.png'); - PMA_buttonOrImage('submit_mult', 'mult_submit', 'submin_mult_unique', $strUnique, 'b_unique.png'); + PMA_buttonOrImage('submit_mult', 'mult_submit', 'submit_mult_primary', $strPrimary, 'b_primary.png'); + PMA_buttonOrImage('submit_mult', 'mult_submit', 'submit_mult_index', $strIndex, 'b_index.png'); + PMA_buttonOrImage('submit_mult', 'mult_submit', 'submit_mult_unique', $strUnique, 'b_unique.png'); if ((!empty($tbl_type) && $tbl_type == 'MYISAM')) { - PMA_buttonOrImage('submit_mult', 'mult_submit', 'submin_mult_fulltext', $strIdxFulltext, 'b_ftext.png'); + PMA_buttonOrImage('submit_mult', 'mult_submit', 'submit_mult_fulltext', $strIdxFulltext, 'b_ftext.png'); } } else { echo '' . "\n";