diff --git a/ChangeLog b/ChangeLog index 74fa17ac9..75e96cd3c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA thanks to Michael Valushko - dylfin - bug #2794840 [core] Cannot redeclare pma_tableheader() - rfe #2726479 [core] configurable maximal length of URL ++ patch #2724755 [display] Full/partial text links (big T) are back, + thanks to nullbarriere - nullbarriere 3.2.1.0 (not yet released) - bug #2799009 Login with ipv6 IP address breaks redirect diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index 136e2cc9c..7bd9a8926 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -555,6 +555,24 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $ PMA_generate_html_radio('display_text', $choices, $_SESSION['userconf']['display_text']); echo ''; + // prepare full/partial text button or link + if ($_SESSION['userconf']['display_text']=='F') { + // currently in fulltext mode so show the opposite link + $tmp_image_file = $GLOBALS['pmaThemeImage'] . 's_partialtext.png'; + $tmp_txt = $GLOBALS['strPartialText']; + $url_params['display_text'] = 'P'; + } else { + $tmp_image_file = $GLOBALS['pmaThemeImage'] . 's_fulltext.png'; + $tmp_txt = $GLOBALS['strFullText']; + $url_params['display_text'] = 'F'; + } + + $tmp_image = '' . $tmp_txt . ''; + $tmp_url = 'sql.php' . PMA_generate_common_url($url_params); + $full_or_partial_text_link = PMA_linkOrButton($tmp_url, $tmp_image, array(), false); + unset($tmp_image_file, $tmp_txt, $tmp_url, $tmp_image); + + if ($GLOBALS['cfgRelation']['relwork'] && $GLOBALS['cfgRelation']['displaywork']) { echo '
'; $choices = array( @@ -643,7 +661,7 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $ if ($_SESSION['userconf']['disp_direction'] == 'horizontal' || $_SESSION['userconf']['disp_direction'] == 'horizontalflipped') { ?> - > + > -> + >