Index: trunk/core/kernel/application.php
===================================================================
diff -u -r3858 -r3863
--- trunk/core/kernel/application.php	(.../application.php)	(revision 3858)
+++ trunk/core/kernel/application.php	(.../application.php)	(revision 3863)
@@ -477,7 +477,7 @@
 	{
 		if( $this->isDebugMode() && dbg_ConstOn('DBG_PROFILE_MEMORY') )
 		{
-			$GLOBALS['debugger']->appendMemoryUsage('Application before Run:');
+			$this->Debugger->appendMemoryUsage('Application before Run:');
 		}
 
 		if (!$this->RequestProcessed) $this->ProcessRequest();
@@ -501,14 +501,14 @@
 
 		if( $this->isDebugMode() && dbg_ConstOn('DBG_PROFILE_MEMORY') )
 		{
-			$GLOBALS['debugger']->appendMemoryUsage('Application before Parsing:');
+			$this->Debugger->appendMemoryUsage('Application before Parsing:');
 		}
 
 		$this->HTML = $this->Parser->Parse( $template_cache->GetTemplateBody($t), $t );
 
 		if( $this->isDebugMode() && dbg_ConstOn('DBG_PROFILE_MEMORY') )
 		{
-			$GLOBALS['debugger']->appendMemoryUsage('Application after Parsing:');
+			$this->Debugger->appendMemoryUsage('Application after Parsing:');
 		}
 	}
 
@@ -528,7 +528,7 @@
 	{
 		if( $this->isDebugMode() && dbg_ConstOn('DBG_PROFILE_MEMORY') )
 		{
-			$GLOBALS['debugger']->appendMemoryUsage('Application before Done:');
+			$this->Debugger->appendMemoryUsage('Application before Done:');
 		}
 
 		if( $this->GetVar('admin') )
@@ -796,12 +796,12 @@
 			// because this template closes the popup and we don't need popup mark here anymore
 			$params['m_opener'] = 's';
 		}
-		
+
 		if( substr($t, -4) == '.tpl' ) $t = substr($t, 0, strlen($t) - 4 );
 
 		if ( $this->IsAdmin() && $prefix == '') $prefix = '/admin';
 		if ( $this->IsAdmin() && $prefix == '_FRONT_END_') $prefix = '';
-		$index_file = isset($index_file) ? $index_file : (defined('INDEX_FILE') ? INDEX_FILE : basename($_SERVER['SCRIPT_NAME']));
+		$index_file = isset($index_file) ? $index_file : (defined('INDEX_FILE') ? INDEX_FILE : basename($_SERVER['PHP_SELF']));
 
 		if( isset($params['index_file']) )
 		{
@@ -1675,6 +1675,18 @@
 	{
 		return $this->InitDone && (count($this->ModuleInfo) > 0);
 	}
+	
+	/**
+	 * Retuns true if module is enabled
+	 *
+	 * @param string $module_name
+	 * @return bool
+	 */
+	/*function isModuleEnabled($module_name)
+	{
+		return getArrayValue($this->ModuleInfo, $module_name, 'Loaded');
+		
+	}*/
 
 }