Index: trunk/admin/install.php
===================================================================
diff -u -r4867 -r4903
--- trunk/admin/install.php	(.../install.php)	(revision 4867)
+++ trunk/admin/install.php	(.../install.php)	(revision 4903)
@@ -1404,7 +1404,7 @@
 			{
 				foreach($modules as $module_name => $module_folder)
 				{
-					$lang_path = MODULES_PATH.'/'.$module_folder.ADMIN_DIR.'/install/langpacks';
+					$lang_path = MODULES_PATH.'/'.$module_folder.'admin/install/langpacks';
 					$lang_xml->Parse($lang_path.'/'.$lang_file, '|0|1|2|', '');
 					if($force_finish) $lang_xml->lang_object->Update();
 				}
Index: trunk/core/kernel/application.php
===================================================================
diff -u -r4880 -r4903
--- trunk/core/kernel/application.php	(.../application.php)	(revision 4880)
+++ trunk/core/kernel/application.php	(.../application.php)	(revision 4903)
@@ -217,9 +217,6 @@
 		$this->UnitConfigReader->scanModules(MODULES_PATH);
 		$this->registerModuleConstants();
 
-		// extracted out of SetDefaultConstants because it uses ConfigValue which is read only in UnitConfigReader (optimization)
-		$this->SetAdminDirectory();
-
 		$rewrite_on = $this->ConfigValue('UseModRewrite');
 		// admin=1 - when front is browsed using admin session
 		$admin_on = getArrayValue($_REQUEST, 'admin') || $this->IsAdmin();
@@ -555,13 +552,6 @@
 		safeDefine('SERVER_NAME', $_SERVER['HTTP_HOST']);
 	}
 
-	function SetAdminDirectory()
-	{
-		$admin_dir = $this->ConfigValue('AdminDirectory');
-		if(!$admin_dir) $admin_dir = 'admin';
-		safeDefine('ADMIN_DIR', $admin_dir);
-	}
-
 	/**
 	 * Registers each module specific constants if any found
 	 *
Index: trunk/kernel/units/help/help_tag_processor.php
===================================================================
diff -u -r4880 -r4903
--- trunk/kernel/units/help/help_tag_processor.php	(.../help_tag_processor.php)	(revision 4880)
+++ trunk/kernel/units/help/help_tag_processor.php	(.../help_tag_processor.php)	(revision 4903)
@@ -55,7 +55,7 @@
 				$this->Application->Factory->includeClassFile('FCKeditor');
 				$oFCKeditor = new FCKeditor('HelpContent');
 				
-				$oFCKeditor->BasePath	= $this->Application->BaseURL('/'.ADMIN_DIR.'/editor/cmseditor');
+				$oFCKeditor->BasePath	= $this->Application->BaseURL('/admin/editor/cmseditor');
 				$oFCKeditor->Width		= '100%';
 				$oFCKeditor->Height		= '300';
 				$oFCKeditor->ToolbarSet	= 'Advanced';
@@ -64,7 +64,7 @@
 				$oFCKeditor->Config = Array(
 					'UserFilesPath' =>	FULL_PATH.'kernel/user_files',
 					'ProjectPath' 	=> 	$this->Application->ConfigValue('Site_Path'),
-					'CustomConfigurationsPath' => rtrim( $this->Application->BaseURL('/'.ADMIN_DIR.'/editor/inp_fckconfig.js'), '/'),
+					'CustomConfigurationsPath' => rtrim( $this->Application->BaseURL('/admin/editor/inp_fckconfig.js'), '/'),
 				);
 	
   				$ret .= $oFCKeditor->CreateHtml();      
Index: trunk/core/units/help/help_tag_processor.php
===================================================================
diff -u -r4880 -r4903
--- trunk/core/units/help/help_tag_processor.php	(.../help_tag_processor.php)	(revision 4880)
+++ trunk/core/units/help/help_tag_processor.php	(.../help_tag_processor.php)	(revision 4903)
@@ -55,7 +55,7 @@
 				$this->Application->Factory->includeClassFile('FCKeditor');
 				$oFCKeditor = new FCKeditor('HelpContent');
 				
-				$oFCKeditor->BasePath	= $this->Application->BaseURL('/'.ADMIN_DIR.'/editor/cmseditor');
+				$oFCKeditor->BasePath	= $this->Application->BaseURL('/admin/editor/cmseditor');
 				$oFCKeditor->Width		= '100%';
 				$oFCKeditor->Height		= '300';
 				$oFCKeditor->ToolbarSet	= 'Advanced';
@@ -64,7 +64,7 @@
 				$oFCKeditor->Config = Array(
 					'UserFilesPath' =>	FULL_PATH.'kernel/user_files',
 					'ProjectPath' 	=> 	$this->Application->ConfigValue('Site_Path'),
-					'CustomConfigurationsPath' => rtrim( $this->Application->BaseURL('/'.ADMIN_DIR.'/editor/inp_fckconfig.js'), '/'),
+					'CustomConfigurationsPath' => rtrim( $this->Application->BaseURL('/admin/editor/inp_fckconfig.js'), '/'),
 				);
 	
   				$ret .= $oFCKeditor->CreateHtml();