Index: branches/5.3.x/units/articles/articles_event_handler.php
===================================================================
diff -u -N -r15809 -r15927
--- branches/5.3.x/units/articles/articles_event_handler.php	(.../articles_event_handler.php)	(revision 15809)
+++ branches/5.3.x/units/articles/articles_event_handler.php	(.../articles_event_handler.php)	(revision 15927)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: articles_event_handler.php 15809 2013-06-25 14:19:03Z alex $
+* @version	$Id: articles_event_handler.php 15927 2013-07-30 10:02:58Z alex $
 * @package	In-News
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -32,7 +32,7 @@
 			/* @var $object kDBList */
 
 			if ( !$this->Application->isAdminUser ) {
-				$where_clause = '(Archived = 0) AND (StartDate < ' . adodb_mktime() . ' OR StartDate = 0) AND (EndOn > ' . adodb_mktime() . ' OR EndOn IS NULL)';
+				$where_clause = '(Archived = 0) AND (StartDate < ' . time() . ' OR StartDate = 0) AND (EndOn > ' . time() . ' OR EndOn IS NULL)';
 				$object->addFilter('archived_filter', $where_clause);
 			}
 		}
@@ -83,7 +83,7 @@
 					LEFT JOIN '.$custom_table.' cd ON c.ResourceId = cd.ResourceId
 					WHERE 	(IF(cd.'.$category_custom_fields['RssLastUpdated'].' IS NULL, 0, cd.'.$category_custom_fields['RssLastUpdated'].') +
 							cd.'.$category_custom_fields['RssUpdateInterval'].' * cd.'.$category_custom_fields['RssUpdateIntervalType'].' <=
-							'.adodb_mktime().') AND (LENGTH('.$category_custom_fields['RssSource'].') > 0)';
+							'.time().') AND (LENGTH('.$category_custom_fields['RssSource'].') > 0)';
 			$categories = $this->Conn->Query($sql, 'CategoryId');
 			if ($categories) {
 				$resource_ids = Array();
@@ -97,7 +97,7 @@
 				}
 
 				$sql = 'UPDATE '.$custom_table.'
-						SET '.$category_custom_fields['RssLastUpdated'].' = '.adodb_mktime().'
+						SET '.$category_custom_fields['RssLastUpdated'].' = '.time().'
 						WHERE ResourceId IN ('.implode(',', $resource_ids).')';
 				$this->Conn->Query($sql);
 			}
@@ -108,7 +108,7 @@
 					LEFT JOIN '.$custom_table.' cd ON c.ResourceId = cd.ResourceId
 					WHERE (	IF(cd.'.$category_custom_fields['RssLastExpired'].' IS NULL, 0, cd.'.$category_custom_fields['RssLastExpired'].') +
 							cd.'.$category_custom_fields['RssExpireInterval'].' * cd.'.$category_custom_fields['RssExpireIntervalType'].' <=
-							'.adodb_mktime().') AND (cd.'.$category_custom_fields['RssDeleteExpired'].' = 1)';
+							'.time().') AND (cd.'.$category_custom_fields['RssDeleteExpired'].' = 1)';
 
 			$categories = $this->Conn->GetCol($sql, 'ResourceId');
 
@@ -126,7 +126,7 @@
 						LEFT JOIN '.$article_custom_table.' cd ON main_table.ResourceId = cd.ResourceId
 						WHERE 	(ci.PrimaryCat = 1) AND
 								(ci.CategoryId IN ('.implode(',', $categories).')) AND
-								(main_table.EndOn < '.adodb_mktime().' AND main_table.EndOn IS NOT NULL) AND
+								(main_table.EndOn < '.time().' AND main_table.EndOn IS NOT NULL) AND
 								(LENGTH(cd.'.$article_custom_fields['RssOriginalURL'].') > 0)';
 				$article_ids = $this->Conn->GetCol($sql);
 				if ($article_ids) {
@@ -137,7 +137,7 @@
 				}
 
 				$sql = 'UPDATE '.$custom_table.'
-						SET '.$category_custom_fields['RssLastExpired'].' = '.adodb_mktime().'
+						SET '.$category_custom_fields['RssLastExpired'].' = '.time().'
 						WHERE ResourceId IN ('.implode(',', array_keys($categories)).')';
 				$this->Conn->Query($sql);
 			}
@@ -306,7 +306,7 @@
 				$object->SetDBField('cust_RssOriginalURL', $data['LINK']);
 				$object->SetDBField('cust_RssArticleCRC', $article_crc);
 				$object->SetDBField($body_field, !array_key_exists('DESCRIPTION', $data) ? $data['ATOM:SUMMARY'] : $data['DESCRIPTION']);
-				$expiration_time = adodb_mktime() + $event->getEventParam('life_time');
+				$expiration_time = time() + $event->getEventParam('life_time');
 				$object->SetDBField('EndOn_date', $expiration_time);
 				$object->SetDBField('EndOn_time', $expiration_time);
 				$object->SetDBField('Status', STATUS_ACTIVE);
@@ -398,7 +398,7 @@
 				$object->SetDBField('cust_RssOriginalURL', $data['LINK']);
 				$object->SetDBField('cust_RssArticleCRC', $article_crc);
 				$object->SetDBField($body_field, !array_key_exists('CONTENT', $data) ? $data['SUMMARY'] : $data['CONTENT']);
-				$expiration_time = adodb_mktime() + $event->getEventParam('life_time');
+				$expiration_time = time() + $event->getEventParam('life_time');
 				$object->SetDBField('EndOn_date', $expiration_time);
 				$object->SetDBField('EndOn_time', $expiration_time);
 				$object->SetDBField('Status', STATUS_ACTIVE);
@@ -553,7 +553,7 @@
 
 			$archive_days = $this->Application->ConfigValue('News_Archive');
 			if ( $archive_days ) {
-				$expire_date = adodb_mktime() + $archive_days * 3600 * 24;
+				$expire_date = time() + $archive_days * 3600 * 24;
 				$object->SetDBField('EndOn_date', $expire_date);
 				$object->SetDBField('EndOn_time', $expire_date);
 			}
Index: branches/5.3.x/install/upgrades.php
===================================================================
diff -u -N -r15901 -r15927
--- branches/5.3.x/install/upgrades.php	(.../upgrades.php)	(revision 15901)
+++ branches/5.3.x/install/upgrades.php	(.../upgrades.php)	(revision 15927)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: upgrades.php 15901 2013-07-12 10:43:28Z alex $
+* @version	$Id: upgrades.php 15927 2013-07-30 10:02:58Z alex $
 * @package	In-News
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -62,6 +62,7 @@
 				'5.2.1-B1' => Array ('Core' => '5.2.1-B1'),
 				'5.2.1-B2' => Array ('Core' => '5.2.1-B2'),
 				'5.2.1-RC1' => Array ('Core' => '5.2.1-RC1'),
+				'5.3.0-B1' => Array ('Core' => '5.3.0-B1'),
 			);
 		}
 
Index: branches/5.3.x/install/upgrades.sql
===================================================================
diff -u -N -r15901 -r15927
--- branches/5.3.x/install/upgrades.sql	(.../upgrades.sql)	(revision 15901)
+++ branches/5.3.x/install/upgrades.sql	(.../upgrades.sql)	(revision 15927)
@@ -147,3 +147,5 @@
 WHERE `Name` = 'In-News';
 
 # ===== v 5.2.1-RC1 =====
+
+# ===== v 5.3.0-B1 =====