Index: trunk/core/units/general/helpers/modules.php
===================================================================
diff -u -N -r7635 -r7855
--- trunk/core/units/general/helpers/modules.php	(.../modules.php)	(revision 7635)
+++ trunk/core/units/general/helpers/modules.php	(.../modules.php)	(revision 7855)
@@ -165,7 +165,7 @@
 		    if (isset($modules)) return $modules;
 
 		    $this->_readConfig();
-		    $license = base64_decode($GLOBALS['g_License']);
+		    $license = isset($GLOBALS['g_License']) ? base64_decode($GLOBALS['g_License']) : '';
 		    $this->_ParseLicense($license);
 
 		    $modules = Array();
@@ -182,7 +182,8 @@
 		    else {
 		        $modules = array_keys($this->Application->ModuleInfo);
 		    }
-				array_push($modules, 'Core', 'Proj-base', 'Proj-CMS', 'Custom');
+		    
+			array_push($modules, 'Core', 'Proj-base', 'Proj-CMS', 'Custom');
 		    return $modules;
 		}
 
@@ -205,7 +206,8 @@
 		 */
 		function _GetDomain()
 		{
-			return $this->Application->ConfigValue('DomainDetect') ? $_SERVER['HTTP_HOST'] : $GLOBALS['g_Domain'];
+			$config_domain = isset($GLOBALS['g_Domain']) ? $GLOBALS['g_Domain'] : '';
+			return $this->Application->ConfigValue('DomainDetect') ? $_SERVER['HTTP_HOST'] : $config_domain;
 		}
 
 		function _keyED($txt, $encrypt_key)