Merge remote-tracking branch 'origin/master'

phpmyadmin · Oct 20, 2012 · 0cfdf05 · 0cfdf05
2 parents 1ae4455 + a90daed
commit 0cfdf05
Showing 1 changed file with 9 additions and 13 deletions.
diff --git a/libraries/DisplayResults.class.php b/libraries/DisplayResults.class.php
@@ -1038,7 +1038,7 @@ private function _getTableHeaders(
         // 1. Set $colspan or $rowspan and generate html with full/partial
         // text button or link
         list($colspan, $rowspan, $button_html)
-            = $this->_getFeildVisibilityParams(
+            = $this->_getFieldVisibilityParams(
                 $directionCondition, $is_display, $full_or_partial_text_link
             );
 
@@ -1309,7 +1309,7 @@ private function _getSortByKeyDropDown(
      *
      * @see     _getTableHeaders()
      */
-    private function _getFeildVisibilityParams(
+    private function _getFieldVisibilityParams(
         $directionCondition, &$is_display, $full_or_partial_text_link
     ) {
 
@@ -1420,7 +1420,7 @@ private function _getFeildVisibilityParams(
 
         return array($colspan, $rowspan, $button_html);
 
-    } // end of the '_getFeildVisibilityParams()' function
+    } // end of the '_getFieldVisibilityParams()' function
 
 
     /**
@@ -2663,7 +2663,7 @@ private function _getTableBody(
 
 
     /**
-     * Prepare rows
+     * Get the values for one data row 
      *
      * @param integer &$dt_result         the link id associated to the query
      *                                    which results have to be displayed
@@ -2703,15 +2703,17 @@ private function _getRowValues(
 
         $row_info = $this->_getRowInfoForSpecialLinks($row, $col_order);
 
-        for ($j = 0; $j < $this->__get('_fields_cnt'); ++$j) {
+        for ($currentColumn = 0; 
+                $currentColumn < $this->__get('_fields_cnt'); 
+                ++$currentColumn) {
 
             // assign $i with appropriate column order
-            $i = $col_order ? $col_order[$j] : $j;
+            $i = $col_order ? $col_order[$currentColumn] : $currentColumn;
 
             $meta    = $fields_meta[$i];
             $not_null_class = $meta->not_null ? 'not_null' : '';
             $relation_class = isset($map[$meta->name]) ? 'relation' : '';
-            $hide_class = ($col_visib && !$col_visib[$j]
+            $hide_class = ($col_visib && ! $col_visib[$currentColumn]
                 // hide per <td> only if the display dir is not vertical
                 && ($_SESSION['tmp_user_values']['disp_direction']
                     != self::DISP_DIR_VERTICAL))
@@ -2722,7 +2724,6 @@ private function _getRowValues(
             $field_type_class
                 = $this->_getClassForDateTimeRelatedFields($meta->type);
 
-            $pointer = $i;
             $is_field_truncated = false;
             // combine all the classes applicable to this column's value
             $class = $this->_getClassesForColumn(
@@ -2853,11 +2854,6 @@ private function _getRowValues(
             if ($meta->numeric == 1) {
                 // n u m e r i c
 
-                // if two fields have the same name (this is possible
-                //       with self-join queries, for example), using $meta->name
-                //       will show both fields NULL even if only one is NULL,
-                //       so use the $pointer
-
                 $vertical_display['data'][$row_no][$i]
                     = $this->_getDataCellForNumericColumns(
                         $row[$i], $class, $condition_field, $meta, $map,