Fixes for r45514 and r45516:

[lhc/web/wiklou.git] / maintenance / parserTestsStaticParserHook.php

diff --git a/maintenance/parserTestsStaticParserHook.php b/maintenance/parserTestsStaticParserHook.php
index 17a11a3..98c4bba 100644 (file)
--- a/maintenance/parserTestsStaticParserHook.php
+++ b/maintenance/parserTestsStaticParserHook.php
@@ -21,18 +21,20 @@ function wfParserTestStaticParserHookSetup( &$parser ) {
        return true;
 }
 
-function wfParserTestStaticParserHookHook( $in, $argv ) {
-       static $buf = null;
-       
+function wfParserTestStaticParserHookHook( $in, $argv, $parser ) {
        if ( ! count( $argv ) ) {
-               $buf = $in;
+               $parser->static_tag_buf = $in;
                return '';
        } else if ( count( $argv ) === 1 && isset( $argv['action'] ) 
                && $argv['action'] === 'flush' && $in === null ) 
        {
                // Clear the buffer, we probably don't need to
-               $tmp = $buf;
-               $buf = null;
+               if ( isset( $parser->static_tag_buf ) ) {
+                       $tmp = $parser->static_tag_buf;
+               } else {
+                       $tmp = '';
+               }
+               $parser->static_tag_buf = null;
                return $tmp;
        } else
                // wtf?