Skip to content

Commit 629e08c

Browse files
author
Marc Delisle
committed
Code cleanup: $disp_mode was always empty at this point
Signed-off-by: Marc Delisle <marc@infomarc.info>
1 parent 8680240 commit 629e08c

8 files changed

Lines changed: 14 additions & 20 deletions

File tree

‎db_qbe.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787

8888
PMA_executeQueryAndSendQueryResponse(
8989
$analyzed_sql_results, false, $_REQUEST['db'], null, false, null, null,
90-
false, null, null, null, null, $goto, $pmaThemeImage, null, null, null,
90+
false, null, null, null, $goto, $pmaThemeImage, null, null, null,
9191
$sql_query, null, null
9292
);
9393
}

‎import.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -711,7 +711,7 @@
711711
$html_output .= PMA_executeQueryAndGetQueryResponse(
712712
$analyzed_sql_results, false, $db, $table, null,
713713
$sql_query, null, $analyzed_sql_results['is_affected'],
714-
null, null, null, null, $goto, $pmaThemeImage,
714+
null, null, null, $goto, $pmaThemeImage,
715715
null, null, null, $sql_query, null, null
716716
);
717717
}

‎libraries/mult_submits.inc.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@
248248

249249
PMA_executeQueryAndSendQueryResponse(
250250
$analyzed_sql_results, false, $db, $table, null, null, null,
251-
false, null, null, null, null, $goto, $pmaThemeImage, null, null,
251+
false, null, null, null, $goto, $pmaThemeImage, null, null,
252252
$query_type, $sql_query, $selected, null
253253
);
254254
} elseif (!$run_parts) {

‎libraries/sql.lib.php‎

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1871,7 +1871,6 @@ function PMA_getHtmlForPrintButton()
18711871
* @param array $analyzed_sql_results analysed sql results
18721872
* @param string $db current database
18731873
* @param string $table current table
1874-
* @param string $disp_mode display mode
18751874
* @param string $message message to show
18761875
* @param array $sql_data sql data
18771876
* @param PMA_DisplayResults $displayResultsObject Instance of DisplayResults.class
@@ -1895,7 +1894,7 @@ function PMA_getHtmlForPrintButton()
18951894
* @return string html
18961895
*/
18971896
function PMA_getQueryResponseForResultsReturned($result,
1898-
$analyzed_sql_results, $db, $table, $disp_mode, $message, $sql_data,
1897+
$analyzed_sql_results, $db, $table, $message, $sql_data,
18991898
$displayResultsObject, $pmaThemeImage,
19001899
$unlim_num_rows, $num_rows, $full_sql_query, $disp_query,
19011900
$disp_message, $profiling_results, $query_type, $selectedTables, $sql_query,
@@ -1940,11 +1939,10 @@ function PMA_getQueryResponseForResultsReturned($result,
19401939
$editable = ($has_unique || $updatableView) && $just_one_table;
19411940

19421941
// Displays the results in a table
1943-
if (empty($disp_mode)) {
1944-
// see the "PMA_setDisplayMode()" function in
1945-
// libraries/DisplayResults.class.php
1946-
$disp_mode = 'urdr111101';
1947-
}
1942+
// see the "PMA_setDisplayMode()" function in
1943+
// libraries/DisplayResults.class.php
1944+
$disp_mode = 'urdr111101';
1945+
19481946
if (!empty($table) && ($GLOBALS['dbi']->isSystemSchema($db) || !$editable)) {
19491947
$disp_mode = 'nnnn110111';
19501948
}
@@ -2056,7 +2054,6 @@ function PMA_getQueryResponseForResultsReturned($result,
20562054
* @param array|null $extra_data extra data
20572055
* @param bool $is_affected whether affected or not
20582056
* @param string $message_to_show message to show
2059-
* @param string $disp_mode display mode
20602057
* @param string $message message
20612058
* @param array|null $sql_data sql data
20622059
* @param string $goto goto page url
@@ -2075,14 +2072,14 @@ function PMA_getQueryResponseForResultsReturned($result,
20752072
*/
20762073
function PMA_executeQueryAndSendQueryResponse($analyzed_sql_results,
20772074
$is_gotofile, $db, $table, $find_real_end, $sql_query_for_bookmark,
2078-
$extra_data, $is_affected, $message_to_show, $disp_mode, $message,
2075+
$extra_data, $is_affected, $message_to_show, $message,
20792076
$sql_data, $goto, $pmaThemeImage, $disp_query, $disp_message,
20802077
$query_type, $sql_query, $selectedTables, $complete_query
20812078
) {
20822079
$html_output = PMA_executeQueryAndGetQueryResponse(
20832080
$analyzed_sql_results, $is_gotofile, $db, $table,
20842081
$find_real_end, $sql_query_for_bookmark,
2085-
$extra_data, $is_affected, $message_to_show, $disp_mode, $message,
2082+
$extra_data, $is_affected, $message_to_show, $message,
20862083
$sql_data, $goto, $pmaThemeImage, $disp_query, $disp_message,
20872084
$query_type, $sql_query, $selectedTables, $complete_query
20882085
);
@@ -2104,7 +2101,6 @@ function PMA_executeQueryAndSendQueryResponse($analyzed_sql_results,
21042101
* @param array|null $extra_data extra data
21052102
* @param bool $is_affected whether affected or not
21062103
* @param string $message_to_show message to show
2107-
* @param string $disp_mode display mode
21082104
* @param string $message message
21092105
* @param array|null $sql_data sql data
21102106
* @param string $goto goto page url
@@ -2123,7 +2119,7 @@ function PMA_executeQueryAndSendQueryResponse($analyzed_sql_results,
21232119
*/
21242120
function PMA_executeQueryAndGetQueryResponse($analyzed_sql_results,
21252121
$is_gotofile, $db, $table, $find_real_end, $sql_query_for_bookmark,
2126-
$extra_data, $is_affected, $message_to_show, $disp_mode, $message,
2122+
$extra_data, $is_affected, $message_to_show, $message,
21272123
$sql_data, $goto, $pmaThemeImage, $disp_query, $disp_message,
21282124
$query_type, $sql_query, $selectedTables, $complete_query
21292125
) {
@@ -2188,7 +2184,6 @@ function PMA_executeQueryAndGetQueryResponse($analyzed_sql_results,
21882184
$analyzed_sql_results,
21892185
$db,
21902186
$table,
2191-
isset($disp_mode) ? $disp_mode : null,
21922187
isset($message) ? $message : null,
21932188
isset($sql_data) ? $sql_data : null,
21942189
$displayResultsObject,

‎libraries/structure.lib.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2864,7 +2864,7 @@ function PMA_displayTableBrowseForSelectedColumns($db, $table, $goto,
28642864

28652865
PMA_executeQueryAndSendQueryResponse(
28662866
$analyzed_sql_results, false, $db, $table, null, null, null, false,
2867-
null, null, null, null, $goto, $pmaThemeImage, null, null,
2867+
null, null, null, $goto, $pmaThemeImage, null, null,
28682868
null, $sql_query, null, null
28692869
);
28702870
}

‎sql.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,6 @@
188188
isset($extra_data) ? $extra_data : null,
189189
$is_affected,
190190
isset($message_to_show) ? $message_to_show : null,
191-
isset($disp_mode) ? $disp_mode : null,
192191
isset($message) ? $message : null,
193192
isset($sql_data) ? $sql_data : null,
194193
$goto,

‎tbl_row_action.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@
138138

139139
PMA_executeQueryAndSendQueryResponse(
140140
$analyzed_sql_results, false, $db, $table, null, null, null, false, null,
141-
null, null, null, $goto, $pmaThemeImage, null, null, null, $sql_query,
141+
null, null, $goto, $pmaThemeImage, null, null, null, $sql_query,
142142
null, null
143143
);
144144
}

‎tbl_select.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474

7575
PMA_executeQueryAndSendQueryResponse(
7676
$analyzed_sql_results, false, $db, $table, null, null, null, false,
77-
null, null, null, null, $GLOBALS['goto'], $pmaThemeImage, null,
77+
null, null, null, $GLOBALS['goto'], $pmaThemeImage, null,
7878
null, null, $sql_query, null, null
7979
);
8080
}

0 commit comments

Comments
 (0)