fixed bug #495105 - FULLTEXT feature with WHERE clause

This commit is contained in:
Loïc Chapeaux
2001-12-19 22:41:23 +00:00
parent da6b72f328
commit d84dc8ce34

View File

@@ -382,7 +382,6 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')){
* @param array which elements to display * @param array which elements to display
* @param array the list of fields properties * @param array the list of fields properties
* @param integer the total number of fields returned by the sql query * @param integer the total number of fields returned by the sql query
* @param string the url-encoded sql query
* *
* @return boolean always true * @return boolean always true
* *
@@ -406,7 +405,7 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')){
* *
* @see PMA_displayTable() * @see PMA_displayTable()
*/ */
function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $encoded_query = '') function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0)
{ {
global $lang, $server, $db, $table; global $lang, $server, $db, $table;
global $goto; global $goto;
@@ -434,7 +433,7 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')){
. '&server=' . $server . '&server=' . $server
. '&db=' . urlencode($db) . '&db=' . urlencode($db)
. '&table=' . urlencode($table) . '&table=' . urlencode($table)
. '&sql_query=' . $encoded_query . '&sql_query=' . urlencode($sql_query)
. '&pos=' . $pos . '&pos=' . $pos
. '&session_max_rows=' . $session_max_rows . '&session_max_rows=' . $session_max_rows
. '&pos=' . $pos . '&pos=' . $pos
@@ -1218,7 +1217,7 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')){
<table border="<?php echo $GLOBALS['cfgBorder']; ?>" cellpadding="5"> <table border="<?php echo $GLOBALS['cfgBorder']; ?>" cellpadding="5">
<?php <?php
echo "\n"; echo "\n";
PMA_displayTableHeaders($is_display, $fields_meta, $fields_cnt, $encoded_sql_query); PMA_displayTableHeaders($is_display, $fields_meta, $fields_cnt);
PMA_displayTableBody($dt_result, $is_display); PMA_displayTableBody($dt_result, $is_display);
// lem9: vertical output case // lem9: vertical output case
if ($disp_direction == 'vertical') { if ($disp_direction == 'vertical') {