Index: branches/5.2.x/core/units/helpers/site_helper.php
===================================================================
diff -u -N -r14699 -r14976
--- branches/5.2.x/core/units/helpers/site_helper.php	(.../site_helper.php)	(revision 14699)
+++ branches/5.2.x/core/units/helpers/site_helper.php	(.../site_helper.php)	(revision 14976)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: site_helper.php 14699 2011-10-26 11:39:38Z alex $
+* @version	$Id: site_helper.php 14976 2012-01-04 09:26:13Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2010 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -117,16 +117,16 @@
 
 			foreach ($site_domains as $id => $site_domain) {
 				if ( in_array($field, $name_fields) ) {
-					if (!$site_domain[$field . 'UsesRegExp']) {
+					if ( !$site_domain[$field . 'UsesRegExp'] ) {
 						// not regular expression -> escape manually
 						$site_domain[$field] = preg_quote($site_domain[$field], '/');
 					}
 
-					if (preg_match('/^' . $site_domain[$field] . ($field == 'DomainName' ? '$' : '') . '/', $value)) {
+					if ( $site_domain[$field] && preg_match('/^' . $site_domain[$field] . ($field == 'DomainName' ? '$' : '') . '/', $value) ) {
 						return $id;
 					}
 				}
-				elseif ($site_domain[$field] == $value) {
+				elseif ( $site_domain[$field] == $value ) {
 					return $id;
 				}
 			}