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

Code cleanup: $disp_mode was always empty at this point

Browse Source 
Signed-off-by: Marc Delisle <marc@infomarc.info>
This commit is contained in:
Marc Delisle 2014-12-28 09:48:04 -05:00
parent 8680240319
commit 629e08cbc4
8 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
db_qbe.php
View File

@ -87,7 +87,7 @@ if (isset($_REQUEST['submit_sql']) && ! empty($sql_query)) {
PMA_executeQueryAndSendQueryResponse(
$analyzed_sql_results, false, $_REQUEST['db'], null, false, null, null,
false, null, null, null, null, $goto, $pmaThemeImage, null, null, null,
false, null, null, null, $goto, $pmaThemeImage, null, null, null,
$sql_query, null, null
);
}

2
import.php
View File

@ -711,7 +711,7 @@ if ($go_sql) {
$html_output .= PMA_executeQueryAndGetQueryResponse(
$analyzed_sql_results, false, $db, $table, null,
$sql_query, null, $analyzed_sql_results['is_affected'],
null, null, null, null, $goto, $pmaThemeImage,
null, null, null, $goto, $pmaThemeImage,
null, null, null, $sql_query, null, null
);
}

2
libraries/mult_submits.inc.php
View File

@ -248,7 +248,7 @@ if (!empty($submit_mult) && !empty($what)) {
PMA_executeQueryAndSendQueryResponse(
$analyzed_sql_results, false, $db, $table, null, null, null,
false, null, null, null, null, $goto, $pmaThemeImage, null, null,
false, null, null, null, $goto, $pmaThemeImage, null, null,
$query_type, $sql_query, $selected, null
);
} elseif (!$run_parts) {

21
libraries/sql.lib.php
View File

@ -1871,7 +1871,6 @@ function PMA_getHtmlForPrintButton()
* @param array $analyzed_sql_results analysed sql results
* @param string $db current database
* @param string $table current table
* @param string $disp_mode display mode
* @param string $message message to show
* @param array $sql_data sql data
* @param PMA_DisplayResults $displayResultsObject Instance of DisplayResults.class
@ -1895,7 +1894,7 @@ function PMA_getHtmlForPrintButton()
* @return string html
*/
function PMA_getQueryResponseForResultsReturned($result,
$analyzed_sql_results, $db, $table, $disp_mode, $message, $sql_data,
$analyzed_sql_results, $db, $table, $message, $sql_data,
$displayResultsObject, $pmaThemeImage,
$unlim_num_rows, $num_rows, $full_sql_query, $disp_query,
$disp_message, $profiling_results, $query_type, $selectedTables, $sql_query,
@ -1940,11 +1939,10 @@ function PMA_getQueryResponseForResultsReturned($result,
$editable = ($has_unique || $updatableView) && $just_one_table;
// Displays the results in a table
if (empty($disp_mode)) {
// see the "PMA_setDisplayMode()" function in
// libraries/DisplayResults.class.php
$disp_mode = 'urdr111101';
}
// see the "PMA_setDisplayMode()" function in
// libraries/DisplayResults.class.php
$disp_mode = 'urdr111101';
if (!empty($table) && ($GLOBALS['dbi']->isSystemSchema($db) || !$editable)) {
$disp_mode = 'nnnn110111';
}
@ -2056,7 +2054,6 @@ function PMA_getQueryResponseForResultsReturned($result,
* @param array|null $extra_data extra data
* @param bool $is_affected whether affected or not
* @param string $message_to_show message to show
* @param string $disp_mode display mode
* @param string $message message
* @param array|null $sql_data sql data
* @param string $goto goto page url
@ -2075,14 +2072,14 @@ function PMA_getQueryResponseForResultsReturned($result,
*/
function PMA_executeQueryAndSendQueryResponse($analyzed_sql_results,
$is_gotofile, $db, $table, $find_real_end, $sql_query_for_bookmark,
$extra_data, $is_affected, $message_to_show, $disp_mode, $message,
$extra_data, $is_affected, $message_to_show, $message,
$sql_data, $goto, $pmaThemeImage, $disp_query, $disp_message,
$query_type, $sql_query, $selectedTables, $complete_query
) {
$html_output = PMA_executeQueryAndGetQueryResponse(
$analyzed_sql_results, $is_gotofile, $db, $table,
$find_real_end, $sql_query_for_bookmark,
$extra_data, $is_affected, $message_to_show, $disp_mode, $message,
$extra_data, $is_affected, $message_to_show, $message,
$sql_data, $goto, $pmaThemeImage, $disp_query, $disp_message,
$query_type, $sql_query, $selectedTables, $complete_query
);
@ -2104,7 +2101,6 @@ function PMA_executeQueryAndSendQueryResponse($analyzed_sql_results,
* @param array|null $extra_data extra data
* @param bool $is_affected whether affected or not
* @param string $message_to_show message to show
* @param string $disp_mode display mode
* @param string $message message
* @param array|null $sql_data sql data
* @param string $goto goto page url
@ -2123,7 +2119,7 @@ function PMA_executeQueryAndSendQueryResponse($analyzed_sql_results,
*/
function PMA_executeQueryAndGetQueryResponse($analyzed_sql_results,
$is_gotofile, $db, $table, $find_real_end, $sql_query_for_bookmark,
$extra_data, $is_affected, $message_to_show, $disp_mode, $message,
$extra_data, $is_affected, $message_to_show, $message,
$sql_data, $goto, $pmaThemeImage, $disp_query, $disp_message,
$query_type, $sql_query, $selectedTables, $complete_query
) {
@ -2188,7 +2184,6 @@ function PMA_executeQueryAndGetQueryResponse($analyzed_sql_results,
$analyzed_sql_results,
$db,
$table,
isset($disp_mode) ? $disp_mode : null,
isset($message) ? $message : null,
isset($sql_data) ? $sql_data : null,
$displayResultsObject,

2
libraries/structure.lib.php
View File

@ -2864,7 +2864,7 @@ function PMA_displayTableBrowseForSelectedColumns($db, $table, $goto,
PMA_executeQueryAndSendQueryResponse(
$analyzed_sql_results, false, $db, $table, null, null, null, false,
null, null, null, null, $goto, $pmaThemeImage, null, null,
null, null, null, $goto, $pmaThemeImage, null, null,
null, $sql_query, null, null
);
}

1
sql.php
View File

@ -188,7 +188,6 @@ PMA_executeQueryAndSendQueryResponse(
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,

2
tbl_row_action.php
View File

@ -138,7 +138,7 @@ if (!empty($submit_mult)) {
PMA_executeQueryAndSendQueryResponse(
$analyzed_sql_results, false, $db, $table, null, null, null, false, null,
null, null, null, $goto, $pmaThemeImage, null, null, null, $sql_query,
null, null, $goto, $pmaThemeImage, null, null, null, $sql_query,
null, null
);
}

2
tbl_select.php
View File

@ -74,7 +74,7 @@ if (! isset($_POST['columnsToDisplay']) && ! isset($_POST['displayAllColumns']))
PMA_executeQueryAndSendQueryResponse(
$analyzed_sql_results, false, $db, $table, null, null, null, false,
null, null, null, null, $GLOBALS['goto'], $pmaThemeImage, null,
null, null, null, $GLOBALS['goto'], $pmaThemeImage, null,
null, null, $sql_query, null, null
);
}