Index: branches/unlabeled/unlabeled-1.59.2/core/kernel/utility/unit_config_reader.php
===================================================================
diff -u -r6448 -r6490
--- branches/unlabeled/unlabeled-1.59.2/core/kernel/utility/unit_config_reader.php	(.../unit_config_reader.php)	(revision 6448)
+++ branches/unlabeled/unlabeled-1.59.2/core/kernel/utility/unit_config_reader.php	(.../unit_config_reader.php)	(revision 6490)
@@ -70,6 +70,7 @@
 		'Application.Caches.ConfigVariables' => $this->Application->Caches['ConfigVariables'],
 		'Application.ConfigCacheIds' => $this->Application->ConfigCacheIds,
 		'Application.ConfigHash' => $this->Application->ConfigHash,
+		'Application.ReplacementTemplates' => $this->Application->ReplacementTemplates,
 		'Application.ModuleInfo' => $this->Application->ModuleInfo,
 		);
 
@@ -104,6 +105,8 @@
 
 			$this->Application->Caches['ConfigVariables'] = $cache['Application.ConfigCacheIds'];
 			$this->Application->ConfigCacheIds = $cache['Application.ConfigCacheIds'];
+			
+			$this->Application->ReplacementTemplates = $cache['Application.ReplacementTemplates'];
 
 			$this->Application->ModuleInfo = $cache['Application.ModuleInfo'];
 
@@ -337,6 +340,11 @@
 				$this->Application->registerAggregateTag($aggregate_tag);
 			}
 		}
+		
+		if (isset($config['ReplacementTemplates']) && $config['ReplacementTemplates']) {
+			// replacement templates defined in this config
+			$this->Application->ReplacementTemplates = array_merge_recursive2($this->Application->ReplacementTemplates, $config['ReplacementTemplates']);
+		}
 
 		if ( $this->Application->isDebugMode() && constOn('DBG_VALIDATE_CONFIGS') && isset($config['TableName']) )
 		{