Index: typo3/sysext/cms/tslib/content/class.tslib_content_fluidtemplate.php
===================================================================
--- typo3/sysext/cms/tslib/content/class.tslib_content_fluidtemplate.php	(revision 9214)
+++ typo3/sysext/cms/tslib/content/class.tslib_content_fluidtemplate.php	(revision )
@@ -94,50 +94,53 @@
 		 **/
 
 			// fetch the FLUID file
-		$templateFile = $GLOBALS['TSFE']->tmpl->getFileName($this->cObj->stdWrap($conf['file'], $conf['file.']));
+		$file = isset($conf['file.'])
+			? $this->cObj->stdWrap($conf['file'], $conf['file.'])
+			: $conf['file'];
+		$templateFile = $GLOBALS['TSFE']->tmpl->getFileName($file);
 		$templatePath = dirname($templateFile) . '/';
-		$layoutRootPath = $templatePath . 'Layouts';
-		$partialRootPath = $templatePath . 'Partials';
 
 			// override the default layout path via typoscript
-		if (isset($conf['layoutRootPath']) || isset($conf['layoutRootPath.'])) {
-			$layoutRootPath = $this->cObj->stdWrap($conf['layoutRootPath'], $conf['layoutRootPath.']);
+		$layoutRootPath = isset($conf['layoutRootPath.'])
+			? $this->cObj->stdWrap($conf['layoutRootPath'], $conf['layoutRootPath.'])
+			: $conf['layoutRootPath'];
+		if(!$layoutRootPath)
+			$layoutRootPath = $templatePath . 'Layouts';
-			$layoutRootPath = t3lib_div::getFileAbsFileName($layoutRootPath);
+		$layoutRootPath = t3lib_div::getFileAbsFileName($layoutRootPath);
-		}
 
 			// override the default partials path via typoscript
-		if (isset($conf['partialRootPath']) || isset($conf['partialRootPath.'])) {
-			$partialRootPath = $this->cObj->stdWrap($conf['partialRootPath'], $conf['partialRootPath.']);
+		$partialRootPath = isset($conf['partialRootPath.'])
+			? $this->cObj->stdWrap($conf['partialRootPath'], $conf['partialRootPath.'])
+			: $conf['partialRootPath'];
+		if(!$partialRootPath)
+			$partialRootPath = $templatePath . 'Partials';
-			$partialRootPath = t3lib_div::getFileAbsFileName($partialRootPath);
+		$partialRootPath = t3lib_div::getFileAbsFileName($partialRootPath);
-		}
 
-
 			// set some default variables for initializing Extbase
-		if (isset($conf['extbase.']['pluginName'])) {
-			$requestPluginName = $conf['extbase.']['pluginName'];
-		} else {
+		$requestPluginName = isset($conf['extbase.']['pluginName.'])
+			? $this->cObj->stdWrap($conf['extbase.']['pluginName'], $conf['extbase.']['pluginName.'])
+			: $conf['extbase.']['pluginName'];
+		if(!$requestPluginName)
 			$requestPluginName = 'pi1';
-		}
 
-		if (isset($conf['extbase.']['controllerExtensionName'])) {
-			$requestControllerExtensionName = $conf['extbase.']['controllerExtensionName'];
-		} else {
+		$requestControllerExtensionName = isset($conf['extbase.']['controllerExtensionName.'])
+			? $this->cObj->stdWrap($conf['extbase.']['controllerExtensionName'], $conf['extbase.']['controllerExtensionName.'])
+			: $conf['extbase.']['controllerExtensionName'];
+		if(!$requestControllerExtensionName)
 			$requestControllerExtensionName = 'cms';
-		}
 
-		if (isset($conf['extbase.']['controllerName'])) {
-			$requestControllerName = $conf['extbase.']['controllerName'];
-		} else {
+		$requestControllerName = isset($conf['extbase.']['controllerName.'])
+			? $this->cObj->stdWrap($conf['extbase.']['controllerName'], $conf['extbase.']['controllerName.'])
+			: $conf['extbase.']['controllerName'];
+		if(!$requestControllerName)
 			$requestControllerName = 'cms';
-		}
 
-		if (isset($conf['extbase.']['controllerActionName'])) {
-			$requestControllerActionName = $conf['extbase.']['controllerActionName'];
-		} else {
+		$requestControllerActionName = isset($conf['extbase.']['controllerActionName.'])
+			? $this->cObj->stdWrap($conf['extbase.']['controllerActionName'], $conf['extbase.']['controllerActionName.'])
+			: $conf['extbase.']['controllerActionName'];
+		if(!$requestControllerActionName)
 			$requestControllerActionName = 'index';
-		}
 
-
 		/**
 		 * 2. initializing Fluid classes,
 		 * first, the controller context needs to be created
@@ -204,13 +207,19 @@
 		/**
 		 * 4. render the content
 		 */
-		$content = $view->render();
-		return $this->cObj->stdWrap($content, $conf['stdWrap.']);
+		$theValue = $view->render();
+
+		if(isset($conf['stdWrap.'])) {
+			$theValue = $this->cObj->stdWrap($theValue, $conf['stdWrap.']);
-	}
+		}
 
+		return $theValue;
+
-}
+	}
 
+}
 
+
 if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['tslib/content/class.tslib_content_fluidtemplate.php']) {
 	include_once ($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['tslib/content/class.tslib_content_fluidtemplate.php']);
 }