Index: branches/5.1.x/core/kernel/processors/main_processor.php
===================================================================
diff -u -N -r13562 -r13750
--- branches/5.1.x/core/kernel/processors/main_processor.php	(.../main_processor.php)	(revision 13562)
+++ branches/5.1.x/core/kernel/processors/main_processor.php	(.../main_processor.php)	(revision 13750)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: main_processor.php 13562 2010-05-14 19:12:24Z alex $
+* @version	$Id: main_processor.php 13750 2010-06-09 20:01:41Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -839,9 +839,10 @@
 			$ssl = $ssl_url !== false ? $ssl_url : $this->Application->ConfigValue('SSL_URL');
 		}
 
-		if (!$ssl) {
+		if (!$ssl || ($this->Application->TemplatesCache->forceThemeName !== false)) {
 			// SSL URL is not set - no way to require SSL
-			return;
+			// internal parsing (e.g. "TemplateParser::_parseTemplate") -> don't redirect
+			return ;
 		}
 
 		$require = false;
@@ -859,6 +860,11 @@
 			}
 		}
 
+		if (EDITING_MODE) {
+			// match SSL mode on front-end to one in administrative console, when browse modes are used
+			$require = $this->Application->ConfigValue('Require_AdminSSL');
+		}
+
 		$http_query =& $this->Application->recallObject('HTTPQuery');
 		$pass = $http_query->getRedirectParams();
 		$pass['pass_events'] = 1; // to make sure all events are passed when redirect happens