Index: branches/5.2.x/core/units/admin/admin_events_handler.php
===================================================================
diff -u -N -r16016 -r16054
--- branches/5.2.x/core/units/admin/admin_events_handler.php	(.../admin_events_handler.php)	(revision 16016)
+++ branches/5.2.x/core/units/admin/admin_events_handler.php	(.../admin_events_handler.php)	(revision 16054)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: admin_events_handler.php 16016 2014-03-19 20:18:21Z alex $
+* @version	$Id: admin_events_handler.php 16054 2014-08-31 10:00:57Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -340,7 +340,7 @@
 			)
 		);
 
-		$grid_fields = Array();
+		$grids_fields = Array();
 
 		$id_field = '';
 		$fields = Array ();
@@ -354,7 +354,12 @@
 			$field_options = Array ();
 
 			if ( $field_info['Key'] == 'PRI' ) {
-				$grid_col_options = Array ('title' => 'column:la_fld_Id', 'filter_block' => 'grid_range_filter', 'width' => 80);
+				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);
+				}
 			}
 			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 . "'";