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

corrected error display shown when browsing a table for the first time after logging

Browse Source
This commit is contained in:
Spun Nakandala 2013-07-20 21:02:24 +05:30
parent 3a924a15fb
commit 36a4ba240a
2 changed files with 25 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
libraries/sql.lib.php
View File

@ -2217,7 +2217,6 @@ function PMA_sendQueryResponse($num_rows, $unlim_num_rows, $is_affected,
* Function to execute the query and send the response
*
* @param array $analyzed_sql_results analysed sql results
* @param string $full_sql_query full sql query
* @param bool $is_gotofile whether goto file or not
* @param string $db current database
* @param string $table current table
@ -2231,7 +2230,6 @@ function PMA_sendQueryResponse($num_rows, $unlim_num_rows, $is_affected,
* @param array $sql_data sql data
* @param string $goto goto page url
* @param string $pmaThemeImage uri of the PMA theme image
* @param string $sql_limit_to_append sql limit to append
* @param string $disp_query display query
* @param string $disp_message display message
* @param string $query_type query type
@ -2244,10 +2242,10 @@ function PMA_sendQueryResponse($num_rows, $unlim_num_rows, $is_affected,
*
* @return void
*/
function PMA_executeQueryAndSendQueryResponse($analyzed_sql_results, $full_sql_query,
function PMA_executeQueryAndSendQueryResponse($analyzed_sql_results,
$is_gotofile, $db, $table, $find_real_end, $import_text, $extra_data,
$is_affected, $message_to_show, $disp_mode, $message, $sql_data, $goto,
$pmaThemeImage, $sql_limit_to_append, $disp_query, $disp_message,
$pmaThemeImage, $disp_query, $disp_message,
$query_type, $sql_query, $selected, $complete_query
) {
// Include PMA_Index class for use in PMA_DisplayResults class
@ -2261,6 +2259,27 @@ function PMA_executeQueryAndSendQueryResponse($analyzed_sql_results, $full_sql_q
$displayResultsObject->setConfigParamsForDisplayTable();
// assign default full_sql_query
$full_sql_query = $sql_query;
// Handle remembered sorting order, only for single table query
if (PMA_isRememberSortingOrder($analyzed_sql_results)) {
PMA_handleSortOrder($db, $table, $analyzed_sql_results, $full_sql_query);
}
// Do append a "LIMIT" clause?
if (PMA_isAppendLimitClause($analyzed_sql_results)) {
list($sql_limit_to_append,
$full_sql_query, $analyzed_display_query, $display_query
) = PMA_appendLimitClause(
$full_sql_query, $analyzed_sql_results['analyzed_sql'],
isset($display_query)
);
} else {
$sql_limit_to_append = '';
}
$reload = PMA_hasCurrentDbChanged($db);
// Execute the query
list($result, $num_rows, $unlim_num_rows, $profiling_results,

26
sql.php
View File

@ -167,37 +167,15 @@ if ($goto == 'sql.php') {
} // end if
// assign default full_sql_query
$full_sql_query = $sql_query;
// Handle remembered sorting order, only for single table query
if (PMA_isRememberSortingOrder($analyzed_sql_results)) {
PMA_handleSortOrder($db, $table, $analyzed_sql_results, $full_sql_query);
}
// Do append a "LIMIT" clause?
if (PMA_isAppendLimitClause($analyzed_sql_results)) {
list($sql_limit_to_append,
$full_sql_query, $analyzed_display_query, $display_query
) = PMA_appendLimitClause(
$full_sql_query, $analyzed_sql_results['analyzed_sql'],
isset($display_query)
);
} else {
$sql_limit_to_append = '';
}
$reload = PMA_hasCurrentDbChanged($db);
PMA_executeQueryAndSendQueryResponse(
$analyzed_sql_results, $full_sql_query, $is_gotofile, $db, $table,
$analyzed_sql_results, $is_gotofile, $db, $table,
isset($find_real_end) ? $find_real_end : null,
isset($import_text) ? $import_text : null,
isset($extra_data) ? $extra_data : null, $is_affected,
isset($message_to_show) ? $message_to_show : null,
isset($disp_mode) ? $disp_mode : null, isset($message) ? $message : null,
isset($sql_data) ? $sql_data : null, $goto, $pmaThemeImage,
$sql_limit_to_append, isset($disp_query) ? $display_query : null,
isset($disp_query) ? $display_query : null,
isset($disp_message) ? $disp_message : null,
isset($query_type) ? $query_type : null,
$sql_query, isset($selected) ? $selected : null,