Index: core/units/admin/admin_events_handler.php IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- core/units/admin/admin_events_handler.php (revision 16044) +++ core/units/admin/admin_events_handler.php (revision ) @@ -340,7 +340,7 @@ ) ); - $grid_fields = Array(); + $grids_fields = Array(); $id_field = ''; $fields = Array (); @@ -354,8 +354,13 @@ $field_options = Array (); if ( $field_info['Key'] == 'PRI' ) { + if ( $field_info['Field'] == 'Id' ) { + $grid_col_options = Array ('filter_block' => 'grid_range_filter', 'width' => 80); + } + else { - $grid_col_options = Array ('title' => 'column:la_fld_Id', 'filter_block' => 'grid_range_filter', 'width' => 80); - } + $grid_col_options = Array ('title' => 'column:la_fld_Id', 'filter_block' => 'grid_range_filter', 'width' => 80); + } + } else { $grid_col_options = Array ('filter_block' => 'grid_like_filter'); } @@ -1211,21 +1216,27 @@ } if ( is_array($var) ) { - $ret .= 'Array ('; + $ret .= 'array('; $prepend = $expand ? "\n" . str_repeat("\t", $level + 1) : ''; foreach ($var as $key => $value) { array_push($this->parentPath, $key); - $ret .= $prepend . (is_string($key) ? "'" . $key . "'" : $key) . ' => ' . $this->decorate($value, $level + 1) . ', '; + $ret .= $prepend . (is_string($key) ? "'" . $key . "'" : $key) . ' => ' . $this->decorate($value, $level + 1); + $ret .= ',' . ($expand ? '' : ' '); array_pop($this->parentPath); } $prepend = $expand ? "\n" . str_repeat("\t", $level) : ''; - $ret = rtrim($ret, ', ') . $prepend . ')'; + + if ( !$expand ) { + $ret = rtrim($ret, ', '); - } + } + + $ret .= $prepend . ')'; + } else { if ( is_null($var) ) { - $ret = 'NULL'; + $ret = 'null'; } elseif ( is_string($var) ) { $ret = "'" . $var . "'";