The branch, master has been updated
via 5cae0941647ea53b870d320052d5e76ae85913c5 (commit)
via 63d164ca9945c7f4295706062666e263df8b6c4f (commit)
from c1608b6bd6ccc8a3f93e35cf32cf35b5fc97255c (commit)
- Log -----------------------------------------------------------------
commit 5cae0941647ea53b870d320052d5e76ae85913c5
Merge: c1608b6 63d164c
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: Mon Sep 19 23:08:32 2011 +0530
Merge branch 'QA_3_4'
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 1 +
libraries/display_tbl.lib.php | 18 +++++++++++++++---
2 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index e8986d6..8d2e08d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -57,6 +57,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
diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php
index b4c9646..dc9d817 100644
--- a/libraries/display_tbl.lib.php
+++ b/libraries/display_tbl.lib.php
@@ -617,19 +617,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);
@@ -1995,6 +2003,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,
@@ -2008,6 +2018,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']) {
hooks/post-receive
--
phpMyAdmin
Show replies by date