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

bug #3411535 [display] Full text button unchecks results display options

Browse Source
This commit is contained in:
Madhura Jayaratne
2011-09-19 23:07:42 +05:30
parent f2c7ff357a
commit 63d164ca99
2 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -9,6 +9,7 @@ phpMyAdmin - ChangeLog
- bug #3400690 [privileges] DB-specific privileges won't submit
- bug #3410604 [config] Configuration storage incorrect suggested table name
- bug #3383572 [interface] Cannot execute saved query
- bug #3411535 [display] Full text button unchecks results display options
3.4.5.0 (2011-09-14)
- bug #3375325 [interface] Page list in navigation frame looks odd

18
libraries/display_tbl.lib.php
View File

@@ -555,19 +555,27 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $
echo '</div>';
// prepare full/partial text button or link
$url_params_full_text = array(
'db' => $db,
'table' => $table,
'sql_query' => $sql_query,
'goto' => $goto,
'full_text_button' => 1
);
if ($_SESSION['tmp_user_values']['display_text']=='F') {
// currently in fulltext mode so show the opposite link
$tmp_image_file = $GLOBALS['pmaThemeImage'] . 's_partialtext.png';
$tmp_txt = __('Partial texts');
$url_params['display_text'] = 'P';
$url_params_full_text['display_text'] = 'P';
} else {
$tmp_image_file = $GLOBALS['pmaThemeImage'] . 's_fulltext.png';
$tmp_txt = __('Full texts');
$url_params['display_text'] = 'F';
$url_params_full_text['display_text'] = 'F';
}
$tmp_image = '<img class="fulltext" src="' . $tmp_image_file . '" alt="' . $tmp_txt . '" title="' . $tmp_txt . '" />';
$tmp_url = 'sql.php' . PMA_generate_common_url($url_params);
$tmp_url = 'sql.php' . PMA_generate_common_url($url_params_full_text);
$full_or_partial_text_link = PMA_linkOrButton($tmp_url, $tmp_image, array(), false);
unset($tmp_image_file, $tmp_txt, $tmp_url, $tmp_image);
@@ -1816,6 +1824,8 @@ function PMA_displayTable_checkConfigParams()
} elseif (isset($_REQUEST['display_options_form'])) {
// we know that the checkbox was unchecked
unset($_SESSION['tmp_user_values']['query'][$sql_md5]['display_binary']);
} elseif (isset($_REQUEST['full_text_button'])) {
// do nothing to keep the value that is there in the session
} else {
// selected by default because some operations like OPTIMIZE TABLE
// and all queries involving functions return "binary" contents,
@@ -1829,6 +1839,8 @@ function PMA_displayTable_checkConfigParams()
} elseif (isset($_REQUEST['display_options_form'])) {
// we know that the checkbox was unchecked
unset($_SESSION['tmp_user_values']['query'][$sql_md5]['display_binary_as_hex']);
} elseif (isset($_REQUEST['full_text_button'])) {
// do nothing to keep the value that is there in the session
} else {
// display_binary_as_hex config option
if (isset($GLOBALS['cfg']['DisplayBinaryAsHex']) && true === $GLOBALS['cfg']['DisplayBinaryAsHex']) {