From 76f871585de750aae36e9d52b49735e681eb04f1 Mon Sep 17 00:00:00 2001 From: Dieter Adriaenssens Date: Fri, 25 Jan 2013 13:08:49 +0100 Subject: [PATCH 1/3] remove unused variables --- server_status.php | 1 - server_status_queries.php | 1 - sql.php | 4 ++-- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/server_status.php b/server_status.php index 2d4a33e32c..27d3c6ad80 100644 --- a/server_status.php +++ b/server_status.php @@ -126,7 +126,6 @@ function getServerTrafficHtml($ServerStatusData) PMA_replication_print_status_table($type); } } - unset($types); } $retval .= ''; diff --git a/server_status_queries.php b/server_status_queries.php index 218878b2c8..01d21736b8 100644 --- a/server_status_queries.php +++ b/server_status_queries.php @@ -93,7 +93,6 @@ function getQueryStatisticsHtml($ServerStatusData) arsort($used_queries); $odd_row = true; - $count_displayed_rows = 0; $perc_factor = 100 / $total_queries; //(- $ServerStatusData->status['Connections']); $retval .= '
'; diff --git a/sql.php b/sql.php index ac1114351e..642f0bf587 100644 --- a/sql.php +++ b/sql.php @@ -356,7 +356,7 @@ $displayResultsObject->setConfigParamsForDisplayTable(); * Need to find the real end of rows? */ if (isset($find_real_end) && $find_real_end) { - $unlim_num_rows = PMA_Table::countRecords($db, $table, $force_exact = true); + $unlim_num_rows = PMA_Table::countRecords($db, $table, true); $_SESSION['tmp_user_values']['pos'] = @((ceil( $unlim_num_rows / $_SESSION['tmp_user_values']['max_rows'] ) - 1) * $_SESSION['tmp_user_values']['max_rows']); @@ -1482,7 +1482,7 @@ function getTableHtmlForMultipleQueries( $analyzed_sql = PMA_SQP_analyze($parsed_sql); $is_select = isset($analyzed_sql[0]['queryflags']['select_from']); $unlim_num_rows = PMA_Table::countRecords( - $db, $table, $force_exact = true + $db, $table, true ); $showtable = PMA_Table::sGetStatusInfo($db, $table, null, true); $url_query = PMA_generate_common_url($db, $table); From 049f1a5802fb615e495f0b4dad737a29b1741996 Mon Sep 17 00:00:00 2001 From: Dieter Adriaenssens Date: Fri, 25 Jan 2013 13:10:05 +0100 Subject: [PATCH 2/3] unwrap line --- sql.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sql.php b/sql.php index 642f0bf587..aa397a4355 100644 --- a/sql.php +++ b/sql.php @@ -1481,9 +1481,7 @@ function getTableHtmlForMultipleQueries( $analyzed_sql = PMA_SQP_analyze($parsed_sql); $is_select = isset($analyzed_sql[0]['queryflags']['select_from']); - $unlim_num_rows = PMA_Table::countRecords( - $db, $table, true - ); + $unlim_num_rows = PMA_Table::countRecords($db, $table, true); $showtable = PMA_Table::sGetStatusInfo($db, $table, null, true); $url_query = PMA_generate_common_url($db, $table); From 1dbf02bb2d610c3a75c48d9072d40575545cb025 Mon Sep 17 00:00:00 2001 From: Dieter Adriaenssens Date: Fri, 25 Jan 2013 13:13:35 +0100 Subject: [PATCH 3/3] remove unused variable and simplify code --- user_password.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/user_password.php b/user_password.php index d4322c9c83..08cd45d750 100644 --- a/user_password.php +++ b/user_password.php @@ -174,10 +174,9 @@ function PMA_ChangePassUrlParamsAndSubmitQuery( $local_query = 'SET password = ' . (($password == '') ? '\'\'' : $hashing_function . '(\'' . PMA_Util::sqlAddSlashes($password) . '\')'); - $result = @PMA_DBI_try_query($local_query) - or PMA_Util::mysqlDie( - PMA_DBI_getError(), $sql_query, false, $err_url - ); + if (! @PMA_DBI_try_query($local_query)) { + PMA_Util::mysqlDie(PMA_DBI_getError(), $sql_query, false, $err_url); + } } /**