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

Fix typo that broke multi submits for MSIE (bug #1052674).

Browse Source
This commit is contained in:
Michal Čihař
2004-10-25 13:28:19 +00:00
parent d6b965b4ac
commit f9f7d5666a
3 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -8,6 +8,8 @@ $Source$
2004-10-25 Michal Čihař <michal@cihar.com> 2004-10-25 Michal Čihař <michal@cihar.com>
* libraries/common.lib.php: Fix URI detection in case REQUEST_URI contains * libraries/common.lib.php: Fix URI detection in case REQUEST_URI contains
full URI (patch #1044123). 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 <mkkeck@users.sourceforge.net> 2004-10-24 Michael Keck <mkkeck@users.sourceforge.net>
* config.inc.php, themes/*/layout.inc.php: * config.inc.php, themes/*/layout.inc.php:

16
libraries/display_tbl.lib.php
View File

@@ -460,7 +460,7 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $
if (isset($analyzed_sql[0]['unsorted_query'])) { if (isset($analyzed_sql[0]['unsorted_query'])) {
$unsorted_sql_query = $analyzed_sql[0]['unsorted_query']; $unsorted_sql_query = $analyzed_sql[0]['unsorted_query'];
} }
// we need $sort_expression and $sort_expression_nodir // we need $sort_expression and $sort_expression_nodir
// even if there are many table references // even if there are many table references
@@ -489,7 +489,7 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $
} }
$prev_index = ''; $prev_index = '';
foreach ($ret_keys as $row) { foreach ($ret_keys as $row) {
if ($row['Key_name'] != $prev_index ){ if ($row['Key_name'] != $prev_index ){
$indexes[] = $row['Key_name']; $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') { if ($GLOBALS['cfg']['ShowBrowseComments'] && $GLOBALS['cfgRelation']['commwork'] && $disp_direction != 'horizontalflipped') {
$comments_map = array(); $comments_map = array();
foreach ($analyzed_sql[0]['table_ref'] as $tbl) { foreach ($analyzed_sql[0]['table_ref'] as $tbl) {
$tb = $tbl['table_true_name']; $tb = $tbl['table_true_name'];
$comments_map[$tb] = PMA_getComments($db, $tb); $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. // 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]) &&
isset($comments_map[$fields_meta[$i]->table][$fields_meta[$i]->name])) { isset($comments_map[$fields_meta[$i]->table][$fields_meta[$i]->name])) {
/*$comments_table_wrap_pre = '<table border="0" cellpadding="0" cellspacing="0" width="100%"><tr><th>'; /*$comments_table_wrap_pre = '<table border="0" cellpadding="0" cellspacing="0" width="100%"><tr><th>';
@@ -1867,10 +1867,10 @@ function PMA_displayTable(&$dt_result, &$the_disp_mode, $analyzed_sql)
echo '&nbsp;&nbsp;<i>' . $GLOBALS['strWithChecked'] . '</i>'. "\n"; echo '&nbsp;&nbsp;<i>' . $GLOBALS['strWithChecked'] . '</i>'. "\n";
if ($cfg['PropertiesIconic']) { if ($cfg['PropertiesIconic']) {
PMA_buttonOrImage('submit_mult', 'mult_submit', 'submin_mult_change', $GLOBALS['strChange'], 'b_edit.png'); PMA_buttonOrImage('submit_mult', 'mult_submit', 'submit_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', $delete_text, 'b_drop.png');
if ($analyzed_sql[0]['querytype'] == 'SELECT') { 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"; echo "\n";
} else { } else {

12
tbl_properties_structure.php
View File

@@ -419,16 +419,16 @@ $checkall_url = 'tbl_properties_structure.php?' . PMA_generate_common_url($db,$t
<?php <?php
if ($cfg['PropertiesIconic']) { if ($cfg['PropertiesIconic']) {
PMA_buttonOrImage('submit_mult', 'mult_submit', 'submin_mult_change', $strChange, 'b_edit.png'); PMA_buttonOrImage('submit_mult', 'mult_submit', 'submit_mult_change', $strChange, 'b_edit.png');
// Drop button if there is at least two fields // Drop button if there is at least two fields
if ($fields_cnt > 1) { if ($fields_cnt > 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', 'submit_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', 'submit_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_unique', $strUnique, 'b_unique.png');
if ((!empty($tbl_type) && $tbl_type == 'MYISAM')) { 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 { } else {
echo '<input type="submit" name="submit_mult" value="' . $strChange . '" title="' . $strChange . '" />' . "\n"; echo '<input type="submit" name="submit_mult" value="' . $strChange . '" title="' . $strChange . '" />' . "\n";