Remove odd CSS class logic from PHP code

Odd class is no longer needed as it's now done with pure CSS. Signed-off-by: Patric Gustafsson <patricjgustafsson@outlook.com>
phpmyadmin · Aug 16, 2016 · 038242d · 038242d
1 parent ecbbf33
commit 038242d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 17 deletions.
diff --git a/libraries/insert_edit.lib.php b/libraries/insert_edit.lib.php
@@ -526,7 +526,6 @@ function PMA_getNullifyCodeForNullColumn($column, $foreigners, $foreignData)
  * @param string  $data                  description of the column field
  * @param string  $special_chars         special characters
  * @param array   $foreignData           data about the foreign keys
- * @param boolean $odd_row               whether row is odd
  * @param array   $paramTableDbArray     array containing $table and $db
  * @param integer $rownumber             the row number
  * @param array   $titles                An HTML IMG tag for a particular icon from
@@ -551,7 +550,7 @@ function PMA_getNullifyCodeForNullColumn($column, $foreigners, $foreignData)
  */
 function PMA_getValueColumn($column, $backup_field, $column_name_appendix,
     $onChangeClause, $tabindex, $tabindex_for_value, $idindex, $data,
-    $special_chars, $foreignData, $odd_row, $paramTableDbArray, $rownumber,
+    $special_chars, $foreignData, $paramTableDbArray, $rownumber,
     $titles, $text_dir, $special_chars_encoded, $vkey,
     $is_upload, $biggest_max_file_size,
     $default_char_editing, $no_support_types, $gis_data_types, $extracted_columnspec
@@ -579,8 +578,7 @@ function PMA_getValueColumn($column, $backup_field, $column_name_appendix,
     ) {
         $html_output = '&nbsp;</td>';
         $html_output .= '</tr>';
-        $html_output .= '<tr class="' . ($odd_row ? 'odd' : 'even') . '">'
-            . '<td colspan="5" class="right">';
+        $html_output .= '<tr>' . '<td colspan="5" class="right">';
         $html_output .= PMA_getTextarea(
             $column, $backup_field, $column_name_appendix, $onChangeClause,
             $tabindex, $tabindex_for_value, $idindex, $text_dir,
@@ -2595,16 +2593,15 @@ function PMA_getHtmlForIgnoreOption($row_id, $checked = true)
 /**
  * Function to get html for the function option
  *
- * @param bool   $odd_row              whether odd row or not
  * @param array  $column               column
  * @param string $column_name_appendix column name appendix
  *
  * @return String
  */
-function PMA_getHtmlForFunctionOption($odd_row, $column, $column_name_appendix)
+function PMA_getHtmlForFunctionOption($column, $column_name_appendix)
 {
     $longDoubleTextArea = $GLOBALS['cfg']['LongtextDoubleTextarea'];
-    return '<tr class="noclick ' . ($odd_row ? 'odd' : 'even' ) . '">'
+    return '<tr class="noclick">'
         . '<td '
         . ($longDoubleTextArea
             && mb_strstr($column['True_Type'], 'longtext')
@@ -2670,7 +2667,6 @@ function PMA_getHtmlForInsertEditFormHeader($has_blob_field, $is_upload)
  * @param string $vkey                  validation key
  * @param bool   $insert_mode           whether insert mode
  * @param array  $current_row           current row
- * @param bool   $odd_row               whether odd row
  * @param int    &$o_rows               row offset
  * @param int    &$tabindex             tab index
  * @param int    $columns_cnt           columns count
@@ -2695,7 +2691,7 @@ function PMA_getHtmlForInsertEditFormHeader($has_blob_field, $is_upload)
  */
 function PMA_getHtmlForInsertEditFormColumn($table_columns, $column_number,
     $comments_map, $timestamp_seen, $current_result, $chg_evt_handler,
-    $jsvkey, $vkey, $insert_mode, $current_row, $odd_row, &$o_rows,
+    $jsvkey, $vkey, $insert_mode, $current_row, &$o_rows,
     &$tabindex, $columns_cnt, $is_upload, $tabindex_for_function,
     $foreigners, $tabindex_for_null, $tabindex_for_value, $table, $db,
     $row_id, $titles, $biggest_max_file_size, $default_char_editing,
@@ -2745,7 +2741,7 @@ function PMA_getHtmlForInsertEditFormColumn($table_columns, $column_number,
     }
 
     $html_output = PMA_getHtmlForFunctionOption(
-        $odd_row, $column, $column_name_appendix
+        $column, $column_name_appendix
     );
 
     if ($GLOBALS['cfg']['ShowFieldTypesInDataEditView']) {
@@ -2874,7 +2870,7 @@ function PMA_getHtmlForInsertEditFormColumn($table_columns, $column_number,
         $html_output .= PMA_getValueColumn(
             $column, $backup_field, $column_name_appendix, $onChangeClause,
             $tabindex, $tabindex_for_value, $idindex, $data, $special_chars,
-            $foreignData, $odd_row, array($table, $db), $row_id, $titles,
+            $foreignData, array($table, $db), $row_id, $titles,
             $text_dir, $special_chars_encoded, $vkey, $is_upload,
             $biggest_max_file_size, $default_char_editing,
             $no_support_types, $gis_data_types, $extracted_columnspec
@@ -2931,7 +2927,6 @@ function PMA_getHtmlForInsertEditRow($url_params, $table_columns,
     //store the default value for CharEditing
     $default_char_editing  = $GLOBALS['cfg']['CharEditing'];
     $mime_map = PMA_getMIME($db, $table);
-    $odd_row = true;
     $where_clause = '';
     if (isset($where_clause_array[$row_id])) {
         $where_clause = $where_clause_array[$row_id];
@@ -2949,13 +2944,12 @@ function PMA_getHtmlForInsertEditRow($url_params, $table_columns,
         $html_output .= PMA_getHtmlForInsertEditFormColumn(
             $table_columns, $column_number, $comments_map, $timestamp_seen,
             $current_result, $chg_evt_handler, $jsvkey, $vkey, $insert_mode,
-            $current_row, $odd_row, $o_rows, $tabindex, $columns_cnt, $is_upload,
+            $current_row, $o_rows, $tabindex, $columns_cnt, $is_upload,
             $tabindex_for_function, $foreigners, $tabindex_for_null,
             $tabindex_for_value, $table, $db, $row_id, $titles,
             $biggest_max_file_size, $default_char_editing, $text_dir, $repopulate,
             $column_mime, $where_clause
         );
-        $odd_row = !$odd_row;
     } // end for
     $o_rows++;
     $html_output .= '  </tbody>'

diff --git a/test/libraries/PMA_insert_edit_test.php b/test/libraries/PMA_insert_edit_test.php
@@ -2857,7 +2857,7 @@ public function testGetHtmlForInsertEditFormColumn()
         // Test w/ input transformation
         $actual = PMA_getHtmlForInsertEditFormColumn(
             $table_columns, 0, array(), false, array(), '', '',
-            '', false, array(), false, $o_rows, $tabindex, 0, false, 0,
+            '', false, array(), $o_rows, $tabindex, 0, false, 0,
             array(), 0, 0, 'table', 'db', 0, array(), 0, '', '',
             $repopulate, $column_mime, ''
         );
@@ -2875,7 +2875,7 @@ public function testGetHtmlForInsertEditFormColumn()
             $actual
         );
         $this->assertContains(
-            '<tr class="noclick even">',
+            '<tr class="noclick">',
             $actual
         );
         $this->assertContains(
@@ -2912,7 +2912,7 @@ public function testGetHtmlForInsertEditFormColumn()
         );
         $actual = PMA_getHtmlForInsertEditFormColumn(
             $table_columns, 0, array(), false, array(), '', '',
-            '', true, array(), false, $o_rows, $tabindex, 0, false, 0,
+            '', true, array(), $o_rows, $tabindex, 0, false, 0,
             array(), 0, 0, 'table', 'db', 0, array(), 0, '', '',
             $repopulate, array(), ''
         );