diff --git a/ChangeLog b/ChangeLog index 1302d6509..32dbea9a8 100755 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,9 @@ phpMyAdmin - Changelog $Id$ $Source$ +2003-08-15 Marc Delisle + * tbl_properties_structure.php3: bug 786710, IE and dropping fields + 2003-08-15 Garvin Hicking * tbl_properties_structure.php3: RFE #784900 (show alternate text for multi-submit button) diff --git a/tbl_properties_structure.php3 b/tbl_properties_structure.php3 index 57330f890..f0dd124af 100755 --- a/tbl_properties_structure.php3 +++ b/tbl_properties_structure.php3 @@ -2,7 +2,6 @@ /* $Id$ */ // vim: expandtab sw=4 ts=4 sts=4: - if (!defined('PMA_GRAB_GLOBALS_INCLUDED')) { include('./libraries/grab_globals.lib.php3'); } @@ -16,6 +15,15 @@ if (PMA_MYSQL_INT_VERSION >= 40100 && !defined('PMA_MYSQL_CHARSETS_LIB_INCLUDED' /** * Drop multiple fields if required */ + +// workaround for IE problem: +if (isset($submit_mult_change_x)) { + $submit_mult = $strChange; +} +if (isset($submit_mult_drop_x)) { + $submit_mult = $strDrop; +} + if ((!empty($submit_mult) && isset($selected_fld)) || isset($mult_btn)) { $action = 'tbl_properties_structure.php3'; @@ -73,7 +81,7 @@ $fields_cnt = mysql_num_rows($fields_rs); -
+ @@ -379,14 +387,23 @@ $checkall_url = 'tbl_properties_structure.php3?' . PMA_generate_common_url($db,$ if ($cfg['PropertiesIconic']) { /* Opera has trouble with */ - echo ' ' . "\n"; + /* IE has trouble with ' . "\n"; + } else { + echo ' ' . (($propicon == 'both') ? ' ' . $strChange : '') . "\n"; + } // Drop button if there is at least two fields if ($fields_cnt > 1) { - echo ' ' . "\n"; + if (PMA_USR_BROWSER_AGENT != 'IE') { + echo ' ' . "\n"; + } else { + echo ' ' . (($propicon == 'both') ? ' ' . $strDrop : '') . "\n"; + } } } else { echo ' ' . "\n";