Index: branches/5.3.x/install/install_data.sql
===================================================================
diff -u -r15673 -r15901
--- branches/5.3.x/install/install_data.sql	(.../install_data.sql)	(revision 15673)
+++ branches/5.3.x/install/install_data.sql	(.../install_data.sql)	(revision 15901)
@@ -182,4 +182,4 @@
 
 INSERT INTO ImportScripts VALUES (DEFAULT, 'Articles from CSV file [In-News]', '', 'n', 'In-News', '', 'CSV', '1');
 
-INSERT INTO Modules VALUES ('In-News', 'modules/in-news/', 'n', DEFAULT, 1, 2, 'in-news/', {NewsCatId}, NULL, NULL);
\ No newline at end of file
+INSERT INTO Modules VALUES ('In-News', 'modules/in-news/', 'Intechnic\\InPortal\\Modules\\InNews', 'n', DEFAULT, 1, 2, 'in-news/', {NewsCatId}, NULL, NULL);
\ No newline at end of file
Index: branches/5.3.x/admin_templates/articles/articles_edit.tpl
===================================================================
diff -u -r15689 -r15901
--- branches/5.3.x/admin_templates/articles/articles_edit.tpl	(.../articles_edit.tpl)	(revision 15689)
+++ branches/5.3.x/admin_templates/articles/articles_edit.tpl	(.../articles_edit.tpl)	(revision 15901)
@@ -70,7 +70,7 @@
 			<!-- excerpt: begin -->
 			<inp2:m_RenderElement design="form_row" prefix="n" field="Excerpt" title="la_fld_Excerpt">
 				<td class="control-cell">
-					<textarea tabindex="<inp2:m_get param="tab_index"/>" id="<inp2:n_InputName field="Excerpt"/>" name="<inp2:n_InputName field="Excerpt"/>" style="width: 100%; height: 45px" cols="70" rows="3"><inp2:n_Field field="Excerpt"/></textarea><br />
+					<textarea tabindex="<inp2:m_get param='tab_index'/>" id="<inp2:$prefix_InputName field='$field'/>" name="<inp2:$prefix_InputName field='$field'/>" style="width: 100%; height: 45px" cols="70" rows="3"><inp2:$prefix_Field field="$field"/></textarea><br />
 					<input type="checkbox" name="generate_excerpt" id="generate_excerpt" value="1" /><label for="generate_excerpt"><inp2:m_phrase name="la_prompt_AutoGen_Excerpt"/></label>
 				</td>
 			</inp2:m_RenderElement>
Index: branches/5.3.x/install/upgrades.php
===================================================================
diff -u -r15697 -r15901
--- branches/5.3.x/install/upgrades.php	(.../upgrades.php)	(revision 15697)
+++ branches/5.3.x/install/upgrades.php	(.../upgrades.php)	(revision 15901)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: upgrades.php 15697 2013-02-19 11:33:01Z alex $
+* @version	$Id: upgrades.php 15901 2013-07-12 10:43:28Z alex $
 * @package	In-News
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -60,6 +60,8 @@
 				'5.2.0-RC1' => Array ('Core' => '5.2.0-RC1'),
 				'5.2.0' => Array ('Core' => '5.2.0'),
 				'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'),
 			);
 		}
 
Index: branches/5.3.x/install.php
===================================================================
diff -u -r15488 -r15901
--- branches/5.3.x/install.php	(.../install.php)	(revision 15488)
+++ branches/5.3.x/install.php	(.../install.php)	(revision 15901)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: install.php 14691 2011-10-25 13:43:26Z alex $
+* @version	$Id: install.php 15901 2013-07-12 10:43:28Z alex $
 * @package	In-News
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -11,42 +11,48 @@
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
-	$module_folder = 'modules/in-news';
+$module_folder = 'modules/in-news';
 
-	if (!defined('IS_INSTALL')) {
-		// separate module install
-		define('IS_INSTALL', 1);
-		define('ADMIN', 1);
-		define('FULL_PATH', realpath(dirname(__FILE__) . '/../..') );
+if ( !defined('IS_INSTALL') ) {
+	// separate module install
+	define('IS_INSTALL', 1);
+	define('ADMIN', 1);
+	define('FULL_PATH', realpath(dirname(__FILE__) . '/../..'));
 
-		include_once(FULL_PATH . '/core/kernel/startup.php');
-		require_once FULL_PATH . '/core/install/install_toolkit.php';
+	include_once(FULL_PATH . '/core/kernel/startup.php');
+	require_once FULL_PATH . '/core/install/install_toolkit.php';
 
-		$toolkit = new kInstallToolkit();
+	$constants_file = FULL_PATH . '/' . $module_folder . '/constants.php';
+
+	if ( file_exists($constants_file) ) {
+		require_once $constants_file;
 	}
-	else {
-		// install, using installation wizard
-		$toolkit =& $this->toolkit;
-		/* @var $toolkit kInstallToolkit */
-	}
 
-	$application =& kApplication::Instance();
-	$application->Init();
+	$toolkit = new kInstallToolkit();
+}
+else {
+	// install, using installation wizard
+	$toolkit =& $this->toolkit;
+	/* @var $toolkit kInstallToolkit */
+}
 
-	if ($application->RecallVar('user_id') != USER_ROOT) {
-		die('restricted access!');
-	}
+$application =& kApplication::Instance();
+$application->Init();
 
-	$category =& $toolkit->createModuleCategory('News', 'News Articles', '#in-news/section_design#', 'in-news/img/menu_articles.gif');
+if ( $application->RecallVar('user_id') != USER_ROOT ) {
+	die('restricted access!');
+}
 
-	$toolkit->RunSQL('/' . $module_folder . '/install/install_schema.sql');
-	$toolkit->RunSQL('/' . $module_folder . '/install/install_data.sql', '{NewsCatId}', $category->GetID());
-	$toolkit->ImportLanguage('/' . $module_folder . '/install/english');
+$category =& $toolkit->createModuleCategory('News', 'News Articles', '#in-news/section_design#', 'in-news/img/menu_articles.gif');
 
-	$toolkit->SetModuleRootCategory(basename($module_folder), $category->GetID());
+$toolkit->RunSQL('/' . $module_folder . '/install/install_schema.sql');
+$toolkit->RunSQL('/' . $module_folder . '/install/install_data.sql', '{NewsCatId}', $category->GetID());
+$toolkit->ImportLanguage('/' . $module_folder . '/install/english');
 
-	$toolkit->linkCustomFields(basename($module_folder), 'n', 2); // to create Custom Fields for News
-	$toolkit->linkCustomFields('KERNEL', 'c', 1); // to create ItemTemplate custom field
-	$toolkit->setModuleItemTemplate($category, 'n', '#in-news/item_design#');
+$toolkit->SetModuleRootCategory(basename($module_folder), $category->GetID());
 
-	$toolkit->finalizeModuleInstall($module_folder, true);
\ No newline at end of file
+$toolkit->linkCustomFields(basename($module_folder), 'n', 2); // to create Custom Fields for News
+$toolkit->linkCustomFields('KERNEL', 'c', 1); // to create ItemTemplate custom field
+$toolkit->setModuleItemTemplate($category, 'n', '#in-news/item_design#');
+
+$toolkit->finalizeModuleInstall($module_folder, true);
Index: branches/5.3.x/install/upgrades.sql
===================================================================
diff -u -r15673 -r15901
--- branches/5.3.x/install/upgrades.sql	(.../upgrades.sql)	(revision 15673)
+++ branches/5.3.x/install/upgrades.sql	(.../upgrades.sql)	(revision 15901)
@@ -140,3 +140,10 @@
 UPDATE SystemSettings
 SET DisplayOrder = 20.04
 WHERE VariableName = 'Perpage_NewsReviews';
+
+# ===== v 5.2.1-B2 =====
+UPDATE Modules
+SET ClassNamespace = 'Intechnic\\InPortal\\Modules\\InNews'
+WHERE `Name` = 'In-News';
+
+# ===== v 5.2.1-RC1 =====
Index: branches/5.3.x/units/articles/articles_config.php
===================================================================
diff -u -r15673 -r15901
--- branches/5.3.x/units/articles/articles_config.php	(.../articles_config.php)	(revision 15673)
+++ branches/5.3.x/units/articles/articles_config.php	(.../articles_config.php)	(revision 15901)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: articles_config.php 15673 2013-01-17 11:56:22Z alex $
+* @version	$Id: articles_config.php 15901 2013-07-12 10:43:28Z alex $
 * @package	In-News
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -360,7 +360,7 @@
 				LEFT JOIN '.TABLE_PREFIX.'%3$sCategoryItems ON '.TABLE_PREFIX.'%3$sCategoryItems.ItemResourceId = %1$s.ResourceId
 				LEFT JOIN '.TABLE_PREFIX.'Categories ON '.TABLE_PREFIX.'Categories.CategoryId = '.TABLE_PREFIX.'%3$sCategoryItems.CategoryId
 				LEFT JOIN '.TABLE_PREFIX.'%3$sCatalogImages img ON img.ResourceId = %1$s.ResourceId AND img.DefaultImg = 1
-				LEFT JOIN '.TABLE_PREFIX.'CategoryPermissionsCache perm ON perm.CategoryId = '.TABLE_PREFIX.'%3$sCategoryItems.CategoryId
+				{PERM_JOIN}
 				LEFT JOIN '.TABLE_PREFIX.'Users u ON %1$s.CreatedById = u.PortalUserId
 				LEFT JOIN '.TABLE_PREFIX.'%3$sNewsCustomData cust ON %1$s.ResourceId = cust.ResourceId',
 	),
Index: branches/5.3.x/install/english.lang
===================================================================
diff -u -r15488 -r15901
--- branches/5.3.x/install/english.lang	(.../english.lang)	(revision 15488)
+++ branches/5.3.x/install/english.lang	(.../english.lang)	(revision 15901)
@@ -1,5 +1,9 @@
-<LANGUAGES Version="5">
-	<LANGUAGE Encoding="base64" PackName="English" LocalName="English" DateFormat="m/d/Y" TimeFormat="g:i A" InputDateFormat="m/d/Y" InputTimeFormat="g:i:s A" DecimalPoint="." ThousandSep="," Charset="utf-8" UnitSystem="2" Locale="en-US" UserDocsUrl="http://docs.in-portal.org/eng/index.php">
+<?xml version="1.0" encoding="utf-8"?>
+<LANGUAGES Version="6">
+	<LANGUAGE Encoding="base64" PackName="English" LocalName="English" DateFormat="m/d/Y" ShortDateFormat="m/d" TimeFormat="g:i A" ShortTimeFormat="g:i A" InputDateFormat="m/d/Y" InputTimeFormat="g:i:s A" DecimalPoint="." ThousandSep="," UnitSystem="2" Locale="en-US" UserDocsUrl="http://docs.in-portal.org/eng/index.php">
+		<EMAILDESIGNS>
+			<HTML>JGJvZHkNCjxici8+PGJyLz4NCg0KU2luY2VyZWx5LDxici8+PGJyLz4NCg0KV2Vic2l0ZSBhZG1pbmlzdHJhdGlvbi4NCg0KPCEtLSMjIDxpbnAyOmVtYWlsLWxvZ19JdGVtTGluayB0ZW1wbGF0ZT0icGxhdGZvcm0vbXlfYWNjb3VudC9lbWFpbCIvPiAjIy0tPg==</HTML>
+		</EMAILDESIGNS>
 		<PHRASES>
 			<PHRASE Label="la_Article_Author" Module="In-News" Type="1">QXV0aG9y</PHRASE>
 			<PHRASE Label="la_Article_Date" Module="In-News" Type="1">RGF0ZQ==</PHRASE>