From 26d1b347710c0a841030464bffbc84e26eb4702c Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad@users.mediawiki.org>
Date: Sat, 13 Feb 2010 14:41:04 +0000
Subject: [PATCH] Fix for <poem> after r62416

---
 includes/parser/Parser.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php
index 6cddaf3fa2..a918646ab0 100644
--- a/includes/parser/Parser.php
+++ b/includes/parser/Parser.php
@@ -392,9 +392,13 @@ class Parser
 				}
 				$this->mStripState->general->setPair( $marker, $output );
 			}
-			$text = $this->mStripState->unstripGeneral( $text );
 		}
 
+		# This was originally inserted for transparent tag hooks (now deprecated)
+		# but some extensions (notably <poem>) rely on the extra unstripGeneral()
+		# after unstripNoWiki() so they can modify the contents of <nowiki> tags.
+		$text = $this->mStripState->unstripGeneral( $text );
+
 		$text = Sanitizer::normalizeCharReferences( $text );
 
 		if ( ( $wgUseTidy && $this->mOptions->mTidy ) || $wgAlwaysUseTidy ) {
-- 
2.20.1