Index: trunk/globals.php
===================================================================
diff -u -r1393 -r1434
--- trunk/globals.php	(.../globals.php)	(revision 1393)
+++ trunk/globals.php	(.../globals.php)	(revision 1434)
@@ -139,8 +139,8 @@
     	foreach($module_info as $module_sub_info)
     	{
     		$sql = sprintf($sql_template,$module_sub_info['Table']);
-			$tmp_resourceid = $db->GetOne($sql);
-			if($tmp_resourceid > $max_resourceid) $max_resourceid = $tmp_resourceid;
+				$tmp_resourceid = $db->GetOne($sql);
+				if($tmp_resourceid > $max_resourceid) $max_resourceid = $tmp_resourceid;
     	}
     }
     
Index: trunk/admin/install/langpacks/english.lang
===================================================================
diff -u -r1299 -r1434
--- trunk/admin/install/langpacks/english.lang	(.../english.lang)	(revision 1299)
+++ trunk/admin/install/langpacks/english.lang	(.../english.lang)	(revision 1434)
@@ -70,7 +70,7 @@
 <PHRASE Label="la_topic_sortoder2_prompt" Type="1">QW5kIHRoZW4gYnk=</PHRASE>
 <PHRASE Label="la_topic_newdays_prompt" Type="1">TmV3IFRvcGljcyAoRGF5cyk=</PHRASE>
 <PHRASE Label="la_topic_perpage_prompt" Type="1">TnVtYmVyIG9mIHRvcGljcyBwZXIgcGFnZQ==</PHRASE>
-<PHRASE Label="la_topic_poststopop_prompt" Type="1">TnVtYmVyIG9mIHBvc3RzIHRvIGJlIGNvbnNpZGVyZWQgcG9wdWxhcg==</PHRASE>
+<PHRASE Label="la_topic_poststopop_prompt" Type="1">TWluaW11bSByYXRpbmcgZm9yIGEgdG9waWMgdG8gYmUgUE9Q</PHRASE>
 <PHRASE Label="la_topic_votestohot_prompt" Type="1">TWF4aW11bSBudW1iZXIgb2YgSE9UIHRvcGljcw==</PHRASE>
 <PHRASE Label="la_topic_editorpicksabove_prompt" Type="1">RGlzcGxheSBlZGl0b3IgcGlja3MgYWJvdmUgcmVndWxhciB0b3BpY3M=</PHRASE>
 <PHRASE Label="la_posts_perpage_prompt" Type="1">TnVtYmVyIG9mIHBvc3RzIHBlciBwYWdl</PHRASE>
@@ -379,7 +379,7 @@
 <PHRASE Label="la_news_sortfield2_pompt" Type="1">QW5kIHRoZW4gYnk=</PHRASE>
 <PHRASE Label="la_news_perpage_prompt" Type="1">TnVtYmVyIG9mIGFydGljbGVzIHBlciBwYWdl</PHRASE>
 <PHRASE Label="la_news_newdays_prompt" Type="1">TnVtYmVyIG9mIGRheXMgZm9yIGEgYXJ0aWNsZSB0byBiZSBORVc=</PHRASE>
-<PHRASE Label="la_news_newstopminrating_prompt" Type="1">TWluaW11bSByYXRpbmcgZm9yIGEgYXJ0aWNsZSB0byBiZSBQT1A=</PHRASE>
+<PHRASE Label="la_news_newstopminrating_prompt" Type="1">TWluaW11bSByYXRpbmcgZm9yIGFuIGFydGljbGUgdG8gYmUgUE9Q</PHRASE>
 <PHRASE Label="la_news_votestohot_prompt" Type="1">TWF4aW11bSBudW1iZXIgb2YgSE9UIGFydGljbGVz</PHRASE>
 <PHRASE Label="la_news_editorpicksabove_prompt" Type="1">RGlzcGxheSBlZGl0b3IgUElDS3MgYWJvdmUgcmVndWxhciBhcnRpY2xlcw==</PHRASE>
 <PHRASE Label="la_news_daysarchive_prompt" Type="1">TnVtYmVyIG9mIGRheXMgdG8gYXJjaGl2ZSBhcnRpY2xlcyBhdXRvbWF0aWNhbGx5</PHRASE>
@@ -1672,7 +1672,7 @@
 <PHRASE Label="lu_resetpw_confirm_text" Type="0">QXJlIHlvdSBzdXJlIHlvdSB3YW50IHRvIHJlc2V0IHRoZSBwYXNzd29yZD8=</PHRASE>
 <PHRASE Label="lu_code_expired" Type="0">UGFzc3dvcmQgcmVzZXQgaGFzIGNvZGUgZXhwaXJlZA==</PHRASE>
 <PHRASE Label="lu_code_is_not_valid" Type="0">UGFzc3dvcmQgcmVzZXQgY29kZSBpcyBub3QgdmFsaWQ=</PHRASE>
-<PHRASE Label="lu_ferror_reset_denied" Type="0">WW91IGhhdmUgYWxyZWFkeSByZXF1ZXN0ZWQgYSBwYXNzd29yZCByZXNldC4gUGxlYXNlIHdhaXQgYmVmb3JlIHJlc2V0dGluZyBpdCBhZ2FuLg==</PHRASE>
+<PHRASE Label="lu_ferror_reset_denied" Type="0">Tm90IHJlc2V0</PHRASE>
 <PHRASE Label="lu_cookies_error" Type="0">UGxlYXNlIGVuYWJsZSBjb29raWVzIHRvIGxvZ2luIQ==</PHRASE>
 <PHRASE Label="lu_subscribe_banned" Type="0">U3Vic2NyaXB0aW9uIGRlbmllZA==</PHRASE>
 <PHRASE Label="lu_subscribe_unknown_error" Type="0">VW5kZWZpbmVkIGVycm9yIG9jY3VycmVkLCBzdWJzY3JpcHRpb24gbm90IGNvbXBsZXRlZA==</PHRASE>
@@ -1759,6 +1759,7 @@
 <PHRASE Label="lu_recipient_doesnt_exit" Type="0">VGhlIHJlY2lwaWVudCBkb2VzIG5vdCBleGlzdA==</PHRASE>
 <PHRASE Label="la_no_topics" Type="1">Tm8gdG9waWNz</PHRASE>
 <PHRASE Label="la_event_user.pswd_confirm" Type="1">UGFzc3dvcmQgQ29uZmlybWF0aW9u</PHRASE>
+<PHRASE Label="lu_fieldcustom__drop_down" Type="2">ZHJvcF9kb3du</PHRASE>
 <PHRASE Label="la_Description_in-portal:reviews" Type="1">VGhpcyBzZWN0aW9uIGRpc3BsYXlzIGEgbGlzdCBvZiBhbGwgcmV2aWV3cyBpbiB0aGUgc3lzdGVtLg==</PHRASE>
 <PHRASE Label="la_prompt_allow_reset" Type="1">QWxsb3cgcGFzc3dvcmQgcmVzZXQgYWZ0ZXI=</PHRASE>
 <PHRASE Label="lu_reset_confirm_text" Type="0">UGxlYXNlIGNvbmZpcm0gdGhhdCB5b3Ugd2FudCB0byByZXNldCB5b3VyIHBhc3N3b3JkLg==</PHRASE>
Index: trunk/admin/install/upgrades/changelog_1_0_12.txt
===================================================================
diff -u -r1385 -r1434
--- trunk/admin/install/upgrades/changelog_1_0_12.txt	(.../changelog_1_0_12.txt)	(revision 1385)
+++ trunk/admin/install/upgrades/changelog_1_0_12.txt	(.../changelog_1_0_12.txt)	(revision 1434)
@@ -1,15 +1,22 @@
+File in-portal/globals.php changed
 File in-portal/admin/browse.php changed
 File in-portal/admin/relation_select.php changed
 File in-portal/admin/browse/fw_menu.js changed
 File in-portal/admin/config/addlang.php changed
+File in-portal/admin/help/manual.pdf changed
 File in-portal/admin/include/mainscript.php changed
 File in-portal/admin/install/inportal_data.sql changed
 File in-portal/admin/install/inportal_schema.sql changed
+File in-portal/admin/install/langpacks/english.lang changed
+File in-portal/admin/install/upgrades/changelog_1_0_12.txt is new
+File in-portal/admin/install/upgrades/inportal_check_v1.0.10.php changed
 File in-portal/admin/install/upgrades/inportal_upgrade_v1.0.11.sql changed
 File in-portal/admin/install/upgrades/inportal_upgrade_v1.0.12.sql is new
+File in-portal/admin/install/upgrades/readme_1_0_12.txt is new
 File in-portal/kernel/action.php changed
 File in-portal/kernel/frontaction.php changed
 File in-portal/kernel/parser.php changed
+File in-portal/kernel/startup.php changed
 File in-portal/kernel/admin/advanced_view.php changed
 File in-portal/kernel/admin/include/toolbar/advanced_view.php changed
 File in-portal/kernel/admin/include/toolbar/browse.php changed
@@ -23,15 +30,60 @@
 File in-portal/kernel/include/language.php changed
 File in-portal/kernel/include/parseditem.php changed
 File in-portal/kernel/include/portaluser.php changed
+File in-portal/kernel/include/smtp.php changed
 File in-portal/kernel/include/usersession.php changed
 File in-portal/themes/default/sitemap.tpl is new
 File in-portal/themes/default/common/footer.tpl changed
 File in-portal/themes/default/index/sitemap_cat_element.tpl is new
 File in-portal/themes/default/index/sitemap_subcat_element.tpl is new
 File in-portal/themes/default/register/register_form.tpl changed
 File in-portal/themes/default/specials/special1.tpl is new
+File in-portal/themes/incommerce/index.tpl is new
+File in-portal/themes/incommerce/blocks/adv_search.tpl is new
+File in-portal/themes/incommerce/blocks/cart_indicator.tpl is new
+File in-portal/themes/incommerce/blocks/categories_home.tpl is new
+File in-portal/themes/incommerce/blocks/checkout_steps.tpl is new
+File in-portal/themes/incommerce/blocks/copyright.tpl is new
+File in-portal/themes/incommerce/blocks/credit_cards.tpl is new
+File in-portal/themes/incommerce/blocks/current_path.tpl is new
+File in-portal/themes/incommerce/blocks/footer.tpl is new
+File in-portal/themes/incommerce/blocks/header.tpl is new
+File in-portal/themes/incommerce/blocks/login.tpl is new
+File in-portal/themes/incommerce/blocks/mailing_list.tpl is new
+File in-portal/themes/incommerce/blocks/products.tpl is new
+File in-portal/themes/incommerce/blocks/products_featured.tpl is new
+File in-portal/themes/incommerce/blocks/products_new_home.tpl is new
+File in-portal/themes/incommerce/blocks/products_picks_home.tpl is new
+File in-portal/themes/incommerce/blocks/products_recent.tpl is new
+File in-portal/themes/incommerce/blocks/products_top_sellers.tpl is new
+File in-portal/themes/incommerce/blocks/recommend_site.tpl is new
+File in-portal/themes/incommerce/blocks/sub_categories.tpl is new
+File in-portal/themes/incommerce/blocks/toolbar.tpl is new
+File in-portal/themes/incommerce/img/adv_search.gif is new
+File in-portal/themes/incommerce/img/american_express.gif is new
+File in-portal/themes/incommerce/img/buy.gif is new
+File in-portal/themes/incommerce/img/buy2.gif is new
+File in-portal/themes/incommerce/img/delete.gif is new
+File in-portal/themes/incommerce/img/logo.gif is new
+File in-portal/themes/incommerce/img/master_card.gif is new
+File in-portal/themes/incommerce/img/novus.gif is new
+File in-portal/themes/incommerce/img/s.gif is new
+File in-portal/themes/incommerce/img/visa.gif is new
+File in-portal/themes/incommerce/in-commerce/category.tpl is new
+File in-portal/themes/incommerce/in-commerce/product.tpl is new
+File in-portal/themes/incommerce/in-commerce/shop_cart/billing.tpl is new
+File in-portal/themes/incommerce/in-commerce/shop_cart/shipping.tpl is new
+File in-portal/themes/incommerce/in-commerce/shop_cart/shop_cart.tpl is new
+File in-portal/themes/incommerce/inc/style.css is new
 
 
 Changes in phrases and events:
 
 
+Changed label "la_topic_poststopop_prompt" of type "1"
+Changed label "la_topic_poststopop_prompt" of type "1"
+Changed label "la_news_newstopminrating_prompt" of type "1"
+Changed label "la_news_newstopminrating_prompt" of type "1"
+Changed label "lu_ferror_reset_denied" of type "0"
+Changed label "lu_ferror_reset_denied" of type "0"
+Added label "lu_fieldcustom__drop_down" of type "2"