Index: branches/5.1.x/units/links/links_config.php
===================================================================
diff -u -N -r13939 -r13960
--- branches/5.1.x/units/links/links_config.php	(.../links_config.php)	(revision 13939)
+++ branches/5.1.x/units/links/links_config.php	(.../links_config.php)	(revision 13960)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: links_config.php 13939 2010-09-14 09:14:25Z alex $
+* @version	$Id: links_config.php 13960 2010-09-25 18:36:47Z alex $
 * @package	In-Link
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -377,7 +377,7 @@
 					),
 
 					'FilterMenu'		=>	Array (
-						'Groups' => Array (													
+						'Groups' => Array (
 							Array ('mode' => 'AND', 'filters' => Array ('show_new'), 'type' => HAVING_FILTER),
 							Array ('mode' => 'AND', 'filters' => Array ('show_hot'), 'type' => HAVING_FILTER),
 							Array ('mode' => 'AND', 'filters' => Array ('show_pop'), 'type' => HAVING_FILTER),
@@ -463,8 +463,8 @@
 			            'CachedRating'		=>	Array ('type' => 'string', 'not_null' => 1, 'formatter' => 'kFormatter', 'default' => 0),
 			            'CachedVotesQty'	=>	Array ('type' => 'int', 'formatter' => 'kFormatter', 'not_null' => 1, 'default' => 0),
 			            'CachedReviewsQty'	=>	Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
-			            'CreatedById'		=>	Array ('type' => 'int', 'formatter' => 'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'), 'options' => Array (USER_ROOT => 'root', USER_GUEST => 'Guest'), 'left_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'PortalUser WHERE `%s` = \'%s\'', 'left_key_field' => 'PortalUserId', 'left_title_field' => 'Login', 'not_null' => 1, 'default' => USER_ROOT),
-			            'ModifiedById'		=>	Array ('type' => 'int', 'formatter' => 'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'), 'options' => Array (USER_ROOT => 'root', USER_GUEST => 'Guest'), 'left_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'PortalUser WHERE `%s` = \'%s\'', 'left_key_field' => 'PortalUserId', 'left_title_field' => 'Login', 'not_null' => 1, 'default' => USER_ROOT),
+			            'CreatedById'		=>	Array ('type' => 'int', 'formatter' => 'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'), 'options' => Array (USER_ROOT => 'root', USER_GUEST => 'Guest'), 'left_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'PortalUser WHERE `%s` = \'%s\'', 'left_key_field' => 'PortalUserId', 'left_title_field' => 'Login', 'default' => NULL),
+			            'ModifiedById'		=>	Array ('type' => 'int', 'formatter' => 'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'), 'options' => Array (USER_ROOT => 'root', USER_GUEST => 'Guest'), 'left_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'PortalUser WHERE `%s` = \'%s\'', 'left_key_field' => 'PortalUserId', 'left_title_field' => 'Login', 'default' => NULL),
 			            'Priority'			=>	Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
 			            'Status'			=>	Array (
 			            	'type' => 'int',
@@ -513,24 +513,24 @@
 					    	'type' => 'int',
 					    	'formatter' => 'kOptionsFormatter',
 					    	'options' => Array (0 => 'la_No', 1 => 'la_Yes'),
-					    	'use_phrases' => 1, 'not_null' => 1, 'default' => 1,
+					    	'use_phrases' => 1, 'default' => 1,
 						),
-						'ExportColumns'			=>	Array ('type' => 'string', 'formatter' => 'kOptionsFormatter', 'options' => Array ()),
-						'AvailableColumns'		=>	Array ('type' => 'string', 'formatter' => 'kOptionsFormatter', 'options' => Array ()),
+						'ExportColumns'			=>	Array ('type' => 'string', 'formatter' => 'kOptionsFormatter', 'options' => Array (), 'default' => ''),
+						'AvailableColumns'		=>	Array ('type' => 'string', 'formatter' => 'kOptionsFormatter', 'options' => Array (), 'default' => ''),
 						'CategoryFormat'		=>	Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_MixedCategoryPath', 2 => 'la_SeparatedCategoryPath'), 'use_phrases' => 1, 'default' => 1),
 						'CategorySeparator'		=>	Array ('type' => 'string', 'error_field' => 'CategoryFormat', 'default' => ':'),
 						'IsBaseCategory'		=>	Array (
 					    	'type' => 'int',
 					    	'formatter' => 'kOptionsFormatter',
 					    	'options' => Array (0 => 'la_No', 1 => 'la_Yes'),
-					    	'use_phrases' => 1, 'not_null' => 1, 'default' => 0,
+					    	'use_phrases' => 1, 'default' => 0,
 						),
 						// export related fields: end
 
 						// import related fields: begin
 						'FieldTitles'			=>	Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Automatic', 2 => 'la_Manual'), 'use_phrases' => 1, 'default' => 1),
 						'ImportSource'			=>	Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Upload', 2 => 'la_Local'), 'use_phrases' => 1, 'default' => 2),
-						'ImportFilename'		=>	Array ('type' => 'string', 'formatter' => 'kUploadFormatter', 'max_size' => MAX_UPLOAD_SIZE, 'upload_dir' => EXPORT_BASE_PATH . '/'),
+						'ImportFilename'		=>	Array ('type' => 'string', 'formatter' => 'kUploadFormatter', 'max_size' => MAX_UPLOAD_SIZE, 'upload_dir' => EXPORT_BASE_PATH . '/', 'default' => ''),
 						'ImportLocalFilename'	=>	Array ('type' => 'string', 'formatter' => 'kOptionsFormatter', 'default' => ''),
 						'CheckDuplicatesMethod'	=>	Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_IDField', 2 => 'la_OtherFields'), 'use_phrases' => 1, 'default' => 1),
 						'ReplaceDuplicates'		=>	Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (0 => 'la_No', 1 => 'la_Yes'), 'use_phrases' => 1, 'default' => 0),
@@ -542,7 +542,9 @@
 						'FullImage'				=>	Array ('type' => 'string', 'default' => ''),
 						'ImageAlt'				=>	Array ('type' => 'string', 'default' => ''),
 
-						'Filename'				=>	Array ('type' => 'string', 'not_null' => 1, 'default' => ''),
+						'Filename'				=>	Array ('type' => 'string', 'default' => ''),
+						'CategoryFilename'		=>	Array ('type' => 'string', 'default' => ''),
+						'PrimaryCat'			=>	Array ('type' => 'int', 'default' => 0),
 						'CachedNavbar'			=>	Array ('type' => 'string', 'default' => ''),
 						'ParentPath'			=>	Array ('type' => 'string', 'default' => ''),
 
Index: branches/5.1.x/install/install_schema.sql
===================================================================
diff -u -N -r13095 -r13960
--- branches/5.1.x/install/install_schema.sql	(.../install_schema.sql)	(revision 13095)
+++ branches/5.1.x/install/install_schema.sql	(.../install_schema.sql)	(revision 13960)
@@ -1,45 +1,45 @@
 CREATE TABLE Link (
-  LinkId int(11) NOT NULL auto_increment,
-  Name varchar(255) NOT NULL default '',
-  l1_Name varchar(255) NOT NULL default '',
-  l2_Name varchar(255) NOT NULL default '',
-  l3_Name varchar(255) NOT NULL default '',
-  l4_Name varchar(255) NOT NULL default '',
-  l5_Name varchar(255) NOT NULL default '',
-  AutomaticFilename tinyint(3) unsigned NOT NULL default '1',
+  LinkId int(11) NOT NULL AUTO_INCREMENT,
+  `Name` varchar(255) NOT NULL DEFAULT '',
+  l1_Name varchar(255) NOT NULL DEFAULT '',
+  l2_Name varchar(255) NOT NULL DEFAULT '',
+  l3_Name varchar(255) NOT NULL DEFAULT '',
+  l4_Name varchar(255) NOT NULL DEFAULT '',
+  l5_Name varchar(255) NOT NULL DEFAULT '',
+  AutomaticFilename tinyint(3) unsigned NOT NULL DEFAULT '1',
   Description text,
   l1_Description text,
   l2_Description text,
   l3_Description text,
   l4_Description text,
   l5_Description text,
-  MetaKeywords varchar(255) default NULL,
+  MetaKeywords varchar(255) DEFAULT NULL,
   MetaDescription text,
-  Url varchar(255) NOT NULL default '',
-  CreatedOn int(10) unsigned default NULL,
-  Modified int(10) unsigned default NULL,
-  Expire int(10) unsigned default NULL,
-  Hits double(20,6) NOT NULL default '0.000000',
-  CachedRating varchar(10) NOT NULL default '0',
-  CachedVotesQty int(11) NOT NULL default '0',
-  CachedReviewsQty int(11) NOT NULL default '0',
-  CreatedById int(11) NOT NULL default '-1',
-  ModifiedById int(11) NOT NULL default '-1',
-  Priority int(11) NOT NULL default '0',
-  `Status` tinyint(4) NOT NULL default '2',
-  EditorsPick tinyint(4) NOT NULL default '0',
-  ResourceId int(11) default NULL,
-  HotItem tinyint(4) NOT NULL default '2',
-  PopItem tinyint(4) NOT NULL default '2',
-  NewItem tinyint(4) NOT NULL default '2',
-  OrgId int(11) default NULL,
-  CustomTemplate varchar(255) NOT NULL default '',
-  ReciprocalLinkFound tinyint(3) unsigned NOT NULL default '0',
-  PRIMARY KEY  (LinkId),
+  Url varchar(255) NOT NULL DEFAULT '',
+  CreatedOn int(10) unsigned DEFAULT NULL,
+  Modified int(10) unsigned DEFAULT NULL,
+  Expire int(10) unsigned DEFAULT NULL,
+  Hits double(20,6) NOT NULL DEFAULT '0.000000',
+  CachedRating varchar(10) NOT NULL DEFAULT '0',
+  CachedVotesQty int(11) NOT NULL DEFAULT '0',
+  CachedReviewsQty int(11) NOT NULL DEFAULT '0',
+  CreatedById int(11) DEFAULT NULL,
+  ModifiedById int(11) DEFAULT NULL,
+  Priority int(11) NOT NULL DEFAULT '0',
+  `Status` tinyint(4) NOT NULL DEFAULT '2',
+  EditorsPick tinyint(4) NOT NULL DEFAULT '0',
+  ResourceId int(11) DEFAULT NULL,
+  HotItem tinyint(4) NOT NULL DEFAULT '2',
+  PopItem tinyint(4) NOT NULL DEFAULT '2',
+  NewItem tinyint(4) NOT NULL DEFAULT '2',
+  OrgId int(11) DEFAULT NULL,
+  CustomTemplate varchar(255) NOT NULL DEFAULT '',
+  ReciprocalLinkFound tinyint(3) unsigned NOT NULL DEFAULT '0',
+  PRIMARY KEY (LinkId),
   UNIQUE KEY ResourceId (ResourceId),
-  KEY sorting (Priority,Name),
+  KEY sorting (Priority,`Name`),
   KEY Hits (Hits),
-  KEY Name (Name),
+  KEY `Name` (`Name`),
   KEY l1_Name (l1_Name),
   KEY l2_Name (l2_Name),
   KEY l3_Name (l3_Name),
Index: branches/5.1.x/install/upgrades.sql
===================================================================
diff -u -N -r13821 -r13960
--- branches/5.1.x/install/upgrades.sql	(.../upgrades.sql)	(revision 13821)
+++ branches/5.1.x/install/upgrades.sql	(.../upgrades.sql)	(revision 13960)
@@ -101,4 +101,9 @@
 
 # ===== v 5.1.0-RC1 =====
 
-# ===== v 5.1.0 =====
\ No newline at end of file
+# ===== v 5.1.0 =====
+
+# ===== v 5.1.1-B1 =====
+ALTER TABLE Link
+	CHANGE CreatedById CreatedById INT(11) NULL DEFAULT NULL ,
+	CHANGE ModifiedById ModifiedById INT(11) NULL DEFAULT NULL;
\ No newline at end of file
Index: branches/5.1.x/units/listings/listings_config.php
===================================================================
diff -u -N -r13939 -r13960
--- branches/5.1.x/units/listings/listings_config.php	(.../listings_config.php)	(revision 13939)
+++ branches/5.1.x/units/listings/listings_config.php	(.../listings_config.php)	(revision 13960)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: listings_config.php 13939 2010-09-14 09:14:25Z alex $
+* @version	$Id: listings_config.php 13960 2010-09-25 18:36:47Z alex $
 * @package	In-Link
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -143,8 +143,8 @@
 					),
 
 					'VirtualFields'	=>	Array (
-						'LinkName'	=>	Array ('type' => 'string'),
-						'LinkOwner'	=>	Array ('type' => 'string'),
+						'LinkName'	=>	Array ('type' => 'string', 'default' => ''),
+						'LinkOwner'	=>	Array ('type' => 'string', 'default' => ''),
 					),
 
 					'Grids'	=> Array (
Index: branches/5.1.x/units/link_validation/link_validation_config.php
===================================================================
diff -u -N -r13939 -r13960
--- branches/5.1.x/units/link_validation/link_validation_config.php	(.../link_validation_config.php)	(revision 13939)
+++ branches/5.1.x/units/link_validation/link_validation_config.php	(.../link_validation_config.php)	(revision 13960)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: link_validation_config.php 13939 2010-09-14 09:14:25Z alex $
+* @version	$Id: link_validation_config.php 13960 2010-09-25 18:36:47Z alex $
 * @package	In-Link
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -117,15 +117,15 @@
 		),
 
 		'VirtualFields' => Array (
-			'ForeignLinkId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
-			'LinkName' => Array('type' => 'string', /*'formatter' => 'kMultiLanguage',*/ 'not_null' => 1, 'max_len' => 255, 'default' => ''),
-			'LinkUrl' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''),
+			'ForeignLinkId' => Array ('type' => 'int', 'default' => 0),
+			'LinkName' => Array('type' => 'string', /*'formatter' => 'kMultiLanguage',*/ 'max_len' => 255, 'default' => ''),
+			'LinkUrl' => Array ('type' => 'string', 'default' => ''),
 			'LinkCreatedOn' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#'),
-			'LinkStatus' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Active', 2 => 'la_Pending', 0 => 'la_Disabled'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 2),
+			'LinkStatus' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Active', 2 => 'la_Pending', 0 => 'la_Disabled'), 'use_phrases' => 1, 'default' => 2),
 			'LinkValidationStatus' => Array (
 				'type' => 'int',
 				'formatter' => 'kOptionsFormatter', 'options' => Array (0 => 'la_Text_Not_Validated', 1 => 'la_Text_Valid', 2 => 'la_Text_Invalid'), 'use_phrases' => 1,
-				'not_null' => 1, 'default' => 0
+				'default' => 0
 			),
 
 			// for category path drawing