Index: branches/5.0.x/themes/default2009/platform/elements/html_head.elm.tpl
===================================================================
diff -u -r12298 -r12325
--- branches/5.0.x/themes/default2009/platform/elements/html_head.elm.tpl	(.../html_head.elm.tpl)	(revision 12298)
+++ branches/5.0.x/themes/default2009/platform/elements/html_head.elm.tpl	(.../html_head.elm.tpl)	(revision 12325)
@@ -7,8 +7,11 @@
 <!--## /Meta Keywords and Description ##-->
 
 <inp2:theme.current_StylesheetFile/>
-<link rel="stylesheet" href="<inp2:m_TemplatesBase module='In-Portal'/>inc/jquery/thickbox/thickbox.css" type="text/css" media="screen" />
 
+<inp2:m_ifnot check="m_GetConst" name="EDITING_MODE">
+	<link rel="stylesheet" href="<inp2:m_TemplatesBase module='In-Portal'/>inc/jquery/thickbox/thickbox.css" type="text/css" media="screen" />
+</inp2:m_ifnot>
+
 <link rel="stylesheet" rev="stylesheet" href="<inp2:m_TemplatesBase module='In-Portal'/>inc/styles.css" type="text/css" />
 
 <script type="text/javascript" src="<inp2:m_TemplatesBase module='In-Portal'/>inc/script.js"></script>
@@ -17,8 +20,11 @@
 
 <script type="text/javascript">var inportalBase = '<inp2:m_TemplatesBase module="In-Portal"/>';</script>
 <script type="text/javascript" src="<inp2:m_TemplatesBase module='In-Portal'/>inc/jquery/jquery.pack.js"></script>
-<script type="text/javascript" src="<inp2:m_TemplatesBase module='In-Portal'/>inc/jquery/thickbox/thickbox.js"></script>
 
+<inp2:m_ifnot check="m_GetConst" name="EDITING_MODE">
+	<script type="text/javascript" src="<inp2:m_TemplatesBase module='In-Portal'/>inc/jquery/thickbox/thickbox.js"></script>
+</inp2:m_ifnot>
+
 <script type="text/javascript">
 	var aRatingManager = new RatingManager('<inp2:m_Link template="index" events[#PREFIX#]="OnMakeVote" rating="#VOTE#" id="#ID#" no_amp="1" size="#SIZE#"/>');
 
Index: branches/5.0.x/core/units/categories/categories_tag_processor.php
===================================================================
diff -u -r12320 -r12325
--- branches/5.0.x/core/units/categories/categories_tag_processor.php	(.../categories_tag_processor.php)	(revision 12320)
+++ branches/5.0.x/core/units/categories/categories_tag_processor.php	(.../categories_tag_processor.php)	(revision 12325)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: categories_tag_processor.php 12320 2009-08-17 10:21:48Z alex $
+* @version	$Id: categories_tag_processor.php 12325 2009-08-17 21:53:51Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -1361,13 +1361,13 @@
 
 		$this_url = $this->Application->HREF('', '', Array ('editing_mode' => '#EDITING_MODE#', 'no_amp' => 1));
 		$ret .= "var aTemplateManager = new TemplateManager('" . $edit_template_url . "', '" . $this_url . "', '" . $save_layout_url . "', " . (int)EDITING_MODE . ");\n";
+		$ret .= "var main_title = '" . addslashes( $this->Application->ConfigValue('Site_Name') ) . "';" . "\n";
+		$ret .= "var \$use_popups = " . ($use_popups > 0 ? 'true' : 'false') . ";\n";
+		$ret .= "var \$modal_windows = " . ($use_popups == 2 ? 'true' : 'false') . ";\n";
 
 		if (EDITING_MODE != EDITING_MODE_BROWSE) {
 			$use_popups = (int)$this->Application->ConfigValue('UsePopups');
 
-			$ret .= "var \$use_popups = " . ($use_popups > 0 ? 'true' : 'false') . ";\n";
-			$ret .= "var \$modal_windows = " . ($use_popups == 2 ? 'true' : 'false') . ";\n";
-			$ret .= "var main_title = '" . addslashes( $this->Application->ConfigValue('Site_Name') ) . "';" . "\n";
 			$ret .= "var base_url = '" . $this->Application->BaseURL() . "';" . "\n";
 			$ret .= 'TB.closeHtml = \'<img src="' . $js_url . '/../img/close_window15.gif" width="15" height="15" style="border-width: 0px;" alt="close"/><br/>\';' . "\n";
 
Index: branches/5.0.x/core/kernel/processors/main_processor.php
===================================================================
diff -u -r12323 -r12325
--- branches/5.0.x/core/kernel/processors/main_processor.php	(.../main_processor.php)	(revision 12323)
+++ branches/5.0.x/core/kernel/processors/main_processor.php	(.../main_processor.php)	(revision 12325)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: main_processor.php 12323 2009-08-17 20:39:30Z alex $
+* @version	$Id: main_processor.php 12325 2009-08-17 21:53:51Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -916,9 +916,13 @@
 		}
 	}
 
-	function CaptchaImage($params){
+	function CaptchaImage($params)
+	{
+		$this->Application->SetVar('skip_last_template', 1);
+
 		$captcha_helper =& $this->Application->recallObject('CaptchaHelper');
 		/* @var $captcha_helper kCaptchaHelper */
+
 		$captcha_helper->GenerateCaptchaImage(
 			$this->Application->RecallVar($this->Application->GetVar('var')),
 			$this->Application->GetVar('w'),