Index: trunk/core/units/general/cat_event_handler.php
===================================================================
diff -u -N -r8779 -r8786
--- trunk/core/units/general/cat_event_handler.php	(.../cat_event_handler.php)	(revision 8779)
+++ trunk/core/units/general/cat_event_handler.php	(.../cat_event_handler.php)	(revision 8786)
@@ -242,13 +242,14 @@
 			}
 			$search_event = $event_mapping[$type];
 			$this->$search_event($event);
+
 			$search_table = TABLE_PREFIX.'ses_'.$this->Application->GetSID().'_'.TABLE_PREFIX.'Search';
 			$sql = 'SHOW TABLES LIKE "'.$search_table.'"';
-			if ( $this->Conn->Query($sql) ) {
+			if ($this->Conn->Query($sql)) {
 				$search_res_ids = $this->Conn->GetCol('SELECT ResourceId FROM '.$search_table);
 			}
 
-			if ($search_res_ids) {
+			if (isset($search_res_ids) && $search_res_ids) {
 				$type_clauses['search']['include'] = '%1$s.ResourceId IN ('.implode(',', $search_res_ids).') AND PrimaryCat = 1';
 				$type_clauses['search']['except'] = '%1$s.ResourceId NOT IN ('.implode(',', $search_res_ids).') AND PrimaryCat = 1';
 			}
Index: trunk/themes/default2007/platform/inc/captcha_image.tpl
===================================================================
diff -u -N
--- trunk/themes/default2007/platform/inc/captcha_image.tpl	(revision 0)
+++ trunk/themes/default2007/platform/inc/captcha_image.tpl	(revision 8786)
@@ -0,0 +1 @@
+<inp2:m_NoDebug/><inp2:m_CaptchaImage />
\ No newline at end of file
Index: trunk/themes/default2007/platform/my_account/my_profile.tpl
===================================================================
diff -u -N -r8759 -r8786
--- trunk/themes/default2007/platform/my_account/my_profile.tpl	(.../my_profile.tpl)	(revision 8759)
+++ trunk/themes/default2007/platform/my_account/my_profile.tpl	(.../my_profile.tpl)	(revision 8786)
@@ -26,8 +26,6 @@
 
 		<form method="post" action="<inp2:m_FormAction/>">
 			<table class="form-data fullwidth">
-				<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Login" title="lu_fld_Login"/>
-
 				<inp2:m_if check="m_ConfigEquals" name="User_Password_Auto" value="0">
 					<inp2:m_RenderElement name="inp_edit_password" prefix="u" field="Password" title="lu_fld_Password" style="width:155px" />
 					<inp2:m_RenderElement name="inp_edit_password" prefix="u" field="VerifyPassword" title="lu_fld_VerifyPassword" style="width:155px" />
Index: trunk/themes/default2007/platform/inc/styles.css
===================================================================
diff -u -N -r8771 -r8786
--- trunk/themes/default2007/platform/inc/styles.css	(.../styles.css)	(revision 8771)
+++ trunk/themes/default2007/platform/inc/styles.css	(.../styles.css)	(revision 8786)
@@ -677,3 +677,7 @@
 	padding:6px;
 	color:#21619E;
 	}
+
+.hidden-element {
+	display: none;
+}
Index: trunk/themes/default2007/platform/elements/forms.tpl
===================================================================
diff -u -N -r8724 -r8786
--- trunk/themes/default2007/platform/elements/forms.tpl	(.../forms.tpl)	(revision 8724)
+++ trunk/themes/default2007/platform/elements/forms.tpl	(.../forms.tpl)	(revision 8786)
@@ -13,7 +13,7 @@
 	<inp2:m_phrase name="lu_AProblemInForm"/><br />
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="inp_edit_field_separator">
+<inp2:m_DefineElement name="inp_edit_field_separator" is_last="0">
 	<inp2:m_if check="m_ParamEquals" name="is_last" value="0">
 	<tr>
 		<td colspan="2">
Index: trunk/themes/default2007/platform/login/register.tpl
===================================================================
diff -u -N -r8759 -r8786
--- trunk/themes/default2007/platform/login/register.tpl	(.../register.tpl)	(revision 8759)
+++ trunk/themes/default2007/platform/login/register.tpl	(.../register.tpl)	(revision 8786)
@@ -49,6 +49,23 @@
 				<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Zip" title="lu_fld_Zip" style="width:55px" />
 				<inp2:m_RenderElement name="inp_edit_options" prefix="u" field="Country" title="lu_fld_Country" is_last="1"/>
 
+				<inp2:m_if check="m_ConfigEquals" option="RegistrationCaptcha" value="1">
+					<inp2:m_RenderElement name="inp_edit_field_separator" is_last="0"/>
+
+					<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+						<inp2:m_RenderElement name="inp_edit_field_caption" prefix="u" field="Captcha" title="lu_fld_Captcha"/>
+						<td class="field-value">
+							<inp2:m_if check="u_HasError" field="Captcha">
+								<span class="field-error"><inp2:u_Error field="Captcha"/></span><br />
+							</inp2:m_if>
+							<img src="<inp2:m_Link template="platform/inc/captcha_image" var="register_captcha_code" w="150" h="30"/>" alt="<inp2:m_Phrase name="lu_fld_Captcha"/>"/><br />
+							<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="5" alt=""/><br />
+							<input type="text" class="input-text" name="<inp2:u_InputName field="Captcha"/>" value="<inp2:u_Field field="Captcha"/>" tabindex="<inp2:m_get param="tab_index"/>" style="width: 170px;">
+						</td>
+					</tr>
+				</inp2:m_if>
+
+				<inp2:m_ModuleInclude template="elements/registration_fields"/>
 				<tr>
 					<td colspan="2">
 						<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/grey_pix.gif" width="100%" height="1" align="absmiddle" alt="" />