(bug 2171) The parser is not totally reentrant

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index f504ed0..d13451d 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -284,7 +284,8 @@ Various bugfixes, small features, and a few experimental things:
   when the default charset is set to utf8
 * (bug 2400) don't send confirmation mail on account creation if 
   $wgEmailAuthentication is false.
-
+* (bug 2172) Fix problem with nowiki beeing replaced by marker strings
+  when a template with a gallery was used.
 
 === Caveats ===
 

diff --git a/includes/Parser.php b/includes/Parser.php
index 0824335..1167711 100644 (file)
--- a/includes/Parser.php
+++ b/includes/Parser.php
@@ -3102,9 +3102,10 @@ class Parser
         */
        function renderImageGallery( $text ) {
                # Setup the parser
-               global $wgUser, $wgParser, $wgTitle;
+               global $wgUser, $wgTitle;
                $parserOptions = ParserOptions::newFromUser( $wgUser );
-       
+               $localParser = new Parser();
+               
                global $wgLinkCache;
                $ig = new ImageGallery();
                $ig->setShowBytes( false );
@@ -3130,7 +3131,7 @@ class Parser
                                $label = '';
                        }
                        
-                       $html = $wgParser->parse( $label , $wgTitle, $parserOptions );
+                       $html = $localParser->parse( $label , $wgTitle, $parserOptions );
                        $html = $html->mText;
                        
                        $ig->add( new Image( $nt ), $html );