Index: t3lib/class.t3lib_tsparser_ext.php
===================================================================
--- t3lib/class.t3lib_tsparser_ext.php	(revision 6745)
+++ t3lib/class.t3lib_tsparser_ext.php	(working copy)
@@ -1076,10 +1076,10 @@
 	 * @return	[type]		...
 	 */
 	function ext_readDirResources($path)	{
-		$path=trim($path);
-		if ($path && substr($path,0,10)=='fileadmin/')	{
+		$path = trim($path);
+		if ($path && substr($path, 0, 10) == $GLOBALS['TYPO3_CONF_VARS']['BE']['fileadminDir'])	{
 			$path = rtrim($path, '/');
-			$this->readDirectory(PATH_site.$path);
+			$this->readDirectory(PATH_site . $path);
 		}
 	}
 
@@ -1277,7 +1277,7 @@
 								$val=trim($val);
 								$fI=t3lib_div::split_fileref($val);
 								if ($val && (!$extList || t3lib_div::inList($extList,$fI['fileext'])))	{
-									if ($onlineResourceFlag<=0 && substr($fI['path'],0,10)=='fileadmin/')	{
+									if ($onlineResourceFlag <= 0 && substr($fI['path'], 0, 10) == $GLOBALS['TYPO3_CONF_VARS']['BE']['fileadminDir']) {
 										if ($onlineResourceFlag<0)	{
 											$p_field.='<option value=""></option>';
 										}
Index: typo3/mod/tools/em/class.em_index.php
===================================================================
--- typo3/mod/tools/em/class.em_index.php	(revision 6745)
+++ typo3/mod/tools/em/class.em_index.php	(working copy)
@@ -4346,7 +4346,7 @@
 		t3lib_div::isFirstPartOfStr($removePath,PATH_site.$this->typePaths['G']) ||
 		t3lib_div::isFirstPartOfStr($removePath,PATH_site.$this->typePaths['L']) ||
 		(t3lib_div::isFirstPartOfStr($removePath,PATH_site.$this->typePaths['S']) && $this->systemInstall) ||
-		t3lib_div::isFirstPartOfStr($removePath,PATH_site.'fileadmin/_temp_/'))		// Playing-around directory...
+		t3lib_div::isFirstPartOfStr($removePath, PATH_site . $GLOBALS['TYPO3_CONF_VARS']['BE']['fileadminDir'] . '_temp_/'))		// Playing-around directory...
 		) {
 
 			// All files in extension directory:
@@ -4434,7 +4434,7 @@
 					$path = PATH_site.$this->typePaths[$type];
 					$suffix = '';
 				} else {
-					$path = PATH_site.'fileadmin/_temp_/';
+					$path = PATH_site . $GLOBALS['TYPO3_CONF_VARS']['BE']['fileadminDir'] . '_temp_/';
 					$suffix = '_'.date('dmy-His');
 				}
 				break;
Index: typo3/sysext/cms/tslib/class.tslib_pagegen.php
===================================================================
--- typo3/sysext/cms/tslib/class.tslib_pagegen.php	(revision 6745)
+++ typo3/sysext/cms/tslib/class.tslib_pagegen.php	(working copy)
@@ -152,7 +152,7 @@
 		}
 		$GLOBALS['TSFE']->compensateFieldWidth = ''.$GLOBALS['TSFE']->config['config']['compensateFieldWidth'];
 		$GLOBALS['TSFE']->lockFilePath = ''.$GLOBALS['TSFE']->config['config']['lockFilePath'];
-		$GLOBALS['TSFE']->lockFilePath = $GLOBALS['TSFE']->lockFilePath ? $GLOBALS['TSFE']->lockFilePath : 'fileadmin/';
+		$GLOBALS['TSFE']->lockFilePath = $GLOBALS['TSFE']->lockFilePath ? $GLOBALS['TSFE']->lockFilePath : $GLOBALS['TYPO3_CONF_VARS']['BE']['fileadminDir'];
 		$GLOBALS['TYPO3_CONF_VARS']['GFX']['im_noScaleUp'] = isset($GLOBALS['TSFE']->config['config']['noScaleUp']) ? ''.$GLOBALS['TSFE']->config['config']['noScaleUp'] : $GLOBALS['TYPO3_CONF_VARS']['GFX']['im_noScaleUp'];
 		$GLOBALS['TSFE']->TYPO3_CONF_VARS['GFX']['im_noScaleUp'] = $GLOBALS['TYPO3_CONF_VARS']['GFX']['im_noScaleUp'];
 
Index: typo3/sysext/dbal/handlers/class.tx_dbal_handler_openoffice.php
===================================================================
--- typo3/sysext/dbal/handlers/class.tx_dbal_handler_openoffice.php	(revision 6745)
+++ typo3/sysext/dbal/handlers/class.tx_dbal_handler_openoffice.php	(working copy)
@@ -134,7 +134,7 @@
 		$this->unzip->putFileToArchive('content.xml', $content_xml['content']);
 
 			// Writing ZIP content back to zip-archive file:
-		$result = $this->unzip->compileZipFile('fileadmin/dbtest_output.sxc');
+		$result = $this->unzip->compileZipFile($GLOBALS['TYPO3_CONF_VARS']['BE']['fileadminDir'] . 'dbtest_output.sxc');
 
 		debug($result);
 
Index: typo3/sysext/install/report/class.tx_install_report_installstatus.php
===================================================================
--- typo3/sysext/install/report/class.tx_install_report_installstatus.php	(revision 6745)
+++ typo3/sysext/install/report/class.tx_install_report_installstatus.php	(working copy)
@@ -88,8 +88,8 @@
 			'uploads/pics/'        => 0,
 			'uploads/media/'       => 0,
 			'uploads/tf/'          => 0,
-			'fileadmin/'           => -1,
-			'fileadmin/_temp_/'    => 0,
+			$GLOBALS['TYPO3_CONF_VARS']['BE']['fileadminDir'] => -1,
+			$GLOBALS['TYPO3_CONF_VARS']['BE']['fileadminDir'] . '_temp_/'    => 0,
 		);
 
 		foreach ($checkWritable as $relPath => $requirementLevel) {