diff --git a/ChangeLog b/ChangeLog index 6af91408e..d889f000a 100755 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,10 @@ phpMyAdmin - Changelog $Id$ $Source$ +2003-06-09 Michal Cihar + * libraries/display_tbl.lib.php3: Display Full/Partial text links for + almost every select. + 2003-06-08 Alexander M. Turek * server_privileges.php3: MySQL 4.1 users could not edit column privileges. * tbl_properties.inc.php3, tbl_properties_structure.inc.php3: @@ -2060,4 +2064,4 @@ $Source$ # vim: ft=changelog # vim: expandtab ts=4 sw=4 sts=4 # vim: fde=getline(v\:lnum-1)=~'^\\s*$'&&getline(v\:lnum)=~'\\S'?'>1'\:1&&v\:lnum>8&&getline(v\:lnum)!~'^#' -# vim: fdn=1 fdm=expr \ No newline at end of file +# vim: fdn=1 fdm=expr diff --git a/libraries/display_tbl.lib.php3 b/libraries/display_tbl.lib.php3 index 7c19cab05..e20893067 100644 --- a/libraries/display_tbl.lib.php3 +++ b/libraries/display_tbl.lib.php3 @@ -110,7 +110,7 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')) { $do_display['nav_bar'] = (string) '0'; $do_display['ins_row'] = (string) '0'; $do_display['bkm_form'] = (string) '1'; - $do_display['text_btn'] = (string) '0'; + $do_display['text_btn'] = (string) '1'; $do_display['pview_lnk'] = (string) '1'; } // 2.3 Other statements (ie "SELECT" ones) -> updates @@ -118,18 +118,12 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')) { // $do_display['text_btn'] (keeps other default values) else { $prev_table = $fields_meta[0]->table; + $do_display['text_btn'] = (string) '1'; for ($i = 0; $i < $GLOBALS['fields_cnt']; $i++) { $is_link = ($do_display['edit_lnk'] != 'nn' || $do_display['del_lnk'] != 'nn' || $do_display['sort_lnk'] != '0' || $do_display['ins_row'] != '0'); - // 2.3.1 Displays text cut/expand button? - if ($do_display['text_btn'] == '0' && eregi('BLOB', $fields_meta[$i]->type)) { - $do_display['text_btn'] = (string) '1'; - if (!$is_link) { - break; - } - } // end if (2.3.1) // 2.3.2 Displays edit/delete/sort/insert links? if ($is_link && ($fields_meta[$i]->table == '' || $fields_meta[$i]->table != $prev_table)) {