Index: branches/5.2.x/units/listings/listings_tag_processor.php
===================================================================
diff -u -N -r14254 -r14873
--- branches/5.2.x/units/listings/listings_tag_processor.php	(.../listings_tag_processor.php)	(revision 14254)
+++ branches/5.2.x/units/listings/listings_tag_processor.php	(.../listings_tag_processor.php)	(revision 14873)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: listings_tag_processor.php 14254 2011-03-16 21:30:58Z alex $
+* @version	$Id: listings_tag_processor.php 14873 2011-12-16 11:56:44Z alex $
 * @package	In-Link
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -52,53 +52,37 @@
 			));
 	}
 
-	function ExpirationDate($params)
+	protected function ExpirationDate($params)
 	{
-		$object =& $this->Application->recallObject( $this->getPrefixSpecial(), $this->Prefix, $params );
-		$listing_type =& $this->Application->recallObject( 'lst', 'lst', $params );
+		return $this->_expirationField($params, 'DateFormat');
+	}
 
-		$dur_type_mapping = Array(	1	=>	1,
-									2	=>	60,
-									3	=>	3600,
-									4	=>	3600*24,
-									5	=>	3600*24*7,
-									6	=>	3600*24*365/12,
-									7	=>	3600*24*365
-								);
-		$duration = $listing_type->GetDBField('Duration');
-		$duration_type = $listing_type->GetDBField('DurationType');
-		$expiration_interval = $duration * $dur_type_mapping[$duration_type];
-		$expiration_date = adodb_mktime() + $expiration_interval;
-
-		$lang =& $this->Application->recallObject('lang.current');
-		$format = $lang->GetDBField('DateFormat');
-		$expiration_date = adodb_date($format, $expiration_date);
-
-		return $expiration_date;
+	protected function ExpirationTime($params)
+	{
+		return $this->_expirationField($params, 'TimeFormat');
 	}
 
-	function ExpirationTime($params)
+	protected function _expirationField($params, $format_field)
 	{
-		$object =& $this->Application->recallObject( $this->getPrefixSpecial(), $this->Prefix, $params );
+		$object =& $this->getObject($params);
+		/* @var $object kDBItem */
+
 		$listing_type =& $this->Application->recallObject( 'lst', 'lst', $params );
+		/* @var $listing_type kDBItem */
 
-		$dur_type_mapping = Array(	1	=>	1,
-									2	=>	60,
-									3	=>	3600,
-									4	=>	3600*24,
-									5	=>	3600*24*7,
-									6	=>	3600*24*365/12,
-									7	=>	3600*24*365
-								);
+		$dur_type_mapping = Array (
+			1 => 1, 2 => 60, 3 => 3600, 4 => 3600 * 24,
+			5 => 3600 * 24 * 7, 6 => 3600 * 24 * 365 / 12, 7 => 3600 * 24 * 365
+		);
+
 		$duration = $listing_type->GetDBField('Duration');
 		$duration_type = $listing_type->GetDBField('DurationType');
 		$expiration_interval = $duration * $dur_type_mapping[$duration_type];
 		$expiration_date = adodb_mktime() + $expiration_interval;
 
 		$lang =& $this->Application->recallObject('lang.current');
-		$format = $lang->GetDBField('TimeFormat');
-		$expiration_date = adodb_date($format, $expiration_date);
+		/* @var $lang LanguagesItem */
 
-		return $expiration_date;
+		return adodb_date($lang->GetDBField($format_field), $expiration_date);
 	}
 }
\ No newline at end of file
Index: branches/5.2.x/install/upgrades.php
===================================================================
diff -u -N -r14583 -r14873
--- branches/5.2.x/install/upgrades.php	(.../upgrades.php)	(revision 14583)
+++ branches/5.2.x/install/upgrades.php	(.../upgrades.php)	(revision 14873)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: upgrades.php 14583 2011-09-23 15:15:32Z alex $
+* @version	$Id: upgrades.php 14873 2011-12-16 11:56:44Z alex $
 * @package	In-Link
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -100,31 +100,6 @@
 		}
 
 		/**
-		 * Replaces deprecated detail template design with new one
-		 *
-		 * @param string $prefix
-		 * @param string $from_template
-		 * @param string $to_template
-		 */
-		function _updateDetailTemplate($prefix, $from_template, $to_template)
-		{
-			$sql = 'SELECT CustomFieldId
-					FROM ' . TABLE_PREFIX . 'CustomField
-					WHERE FieldName = "' . $prefix . '_ItemTemplate"';
-			$custom_field_id = $this->Conn->GetOne($sql);
-
-			$ml_formatter =& $this->Application->recallObject('kMultiLanguage');
-			/* @var $ml_formatter kMultiLanguage */
-
-			$field = $ml_formatter->LangFieldName('cust_' . $custom_field_id, true);
-
-			$sql = 'UPDATE ' . TABLE_PREFIX . 'CategoryCustomData
-					SET ' . $field . ' = "' . $to_template . '"
-					WHERE ' . $field . ' = "' . $from_template . '"';
-			$this->Conn->Query($sql);
-		}
-
-		/**
 		 * Update to 5.0.1
 		 *
 		 * @param string $mode when called mode {before, after)
Index: branches/5.2.x/units/links/links_config.php
===================================================================
diff -u -N -r14724 -r14873
--- branches/5.2.x/units/links/links_config.php	(.../links_config.php)	(revision 14724)
+++ branches/5.2.x/units/links/links_config.php	(.../links_config.php)	(revision 14873)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: links_config.php 14724 2011-11-03 08:41:56Z alex $
+* @version	$Id: links_config.php 14873 2011-12-16 11:56:44Z alex $
 * @package	In-Link
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -555,6 +555,9 @@
 						'Filename'				=>	Array ('type' => 'string', 'default' => ''),
 						'CategoryFilename'		=>	Array ('type' => 'string', 'default' => ''),
 						'PrimaryCat'			=>	Array ('type' => 'int', 'default' => 0),
+						'IsHot'					=>	Array ('type' => 'int', 'default' => 0),
+						'IsNew'					=>	Array ('type' => 'int', 'default' => 0),
+						'IsPop'					=>	Array ('type' => 'int', 'default' => 0),
 						'CachedNavbar'			=>	Array ('type' => 'string', 'default' => ''),
 						'ParentPath'			=>	Array ('type' => 'string', 'default' => ''),