Index: typo3/template.php
===================================================================
--- typo3/template.php	(Revision 9115)
+++ typo3/template.php	(Arbeitskopie)
@@ -169,6 +169,7 @@
 	var $postCode='';				// Additional 'page-end' code could be accommulated in this var. It will be outputted at the end of page before </body> and some other internal page-end code.
 	var $docType = '';				// Doc-type used in the header. Default is xhtml_trans. You can also set it to 'html_3', 'xhtml_strict' or 'xhtml_frames'.
 	var $moduleTemplate = '';		// HTML template with markers for module
+	protected $moduleTemplateFilename = '';	// the base file (not overlaid by TBE_STYLES) for the current module, useful for hooks when finding out which modules is rendered currently
 
 		// Other vars you can change, but less frequently used:
 	var $scriptID='';				// Script ID.
@@ -2053,6 +2054,9 @@
 	 * @return	string		HTML of template
 	 */
 	function getHtmlTemplate($filename)	{
+			// setting the name of the original HTML template
+		$this->moduleTemplateFilename = $filename;
+
 		if ($GLOBALS['TBE_STYLES']['htmlTemplates'][$filename]) {
 			$filename = $GLOBALS['TBE_STYLES']['htmlTemplates'][$filename];
 		}
@@ -2075,7 +2079,7 @@
 	 *
 	 * @param	string		filename
 	 */
-	function setModuleTemplate($filename) {
+	public function setModuleTemplate($filename) {
 			// Load Prototype lib for IE event
 		$this->pageRenderer->loadPrototype();
 		$this->loadJavascriptLib('js/iecompatibility.js');
@@ -2124,27 +2128,35 @@
 			$moduleBody = t3lib_parsehtml::substituteSubpart($moduleBody, $marker, $content);
 		}
 
+			// adding flash messages
 		if ($this->showFlashMessages) {
-				// adding flash messages
 			$flashMessages = t3lib_FlashMessageQueue::renderFlashMessages();
 			if (!empty($flashMessages)) {
-				$flashMessages = '<div id="typo3-messages">' . $flashMessages . '</div>';
+				$markerArray['FLASHMESSAGES'] = '<div id="typo3-messages">' . $flashMessages . '</div>';
+
+					// if there is no dedicated marker for the messages present
+					// then force them to appear before the content
+				if (strpos($moduleBody, '###FLASHMESSAGES###') === FALSE) {
+					$moduleBody = str_replace(
+						'###CONTENT###',
+						'###FLASHMESSAGES######CONTENT###',
+						$moduleBody
+					);
+				}
 			}
+		}
 
-			if (strstr($moduleBody, '###FLASHMESSAGES###')) {
-					// either replace a dedicated marker for the messages if present
-				$moduleBody = str_replace(
-					'###FLASHMESSAGES###',
-					$flashMessages,
-					$moduleBody
-				);
-			} else {
-					// or force them to appear before the content
-				$moduleBody = str_replace(
-					'###CONTENT###',
-					$flashMessages . '###CONTENT###',
-					$moduleBody
-				);
+			// Hook for adding more markers/content to the page, like the version selector
+		if (isset($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['typo3/template.php']['moduleBodyPostProcess'])) {
+			$params = array(
+				'moduleTemplateFilename' => &$this->moduleTemplateFilename,
+				'moduleTemplate' => &$this->moduleTemplate,
+				'moduleBody' => &$moduleBody,
+				'markers' => &$markerArray,
+				'pObj' => &$this
+			);
+			foreach ($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['typo3/template.php']['moduleBodyPostProcess'] as $funcRef) {
+				t3lib_div::callUserFunction($funcRef, $params, $this);
 			}
 		}