From b9b85843572bf283f48285001e276ba7e61b63f6 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Sun, 22 Feb 2009 13:37:51 +0100
Subject: updated to MediaWiki 1.14.0

---
 maintenance/parserTestsStaticParserHook.php | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

(limited to 'maintenance/parserTestsStaticParserHook.php')

diff --git a/maintenance/parserTestsStaticParserHook.php b/maintenance/parserTestsStaticParserHook.php
index 5a98a89d..98c4bba1 100644
--- a/maintenance/parserTestsStaticParserHook.php
+++ b/maintenance/parserTestsStaticParserHook.php
@@ -21,24 +21,27 @@ 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 && $argv['action'] === 'flush' && $in === null ) {
+	} 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?
-		die(
+		return
 			"\nCall this extension as <statictag>string</statictag> or as" .
 			" <statictag action=flush/>, not in any other way.\n" .
 			"text: " . var_export( $in, true ) . "\n" .
-			"argv: " . var_export( $argv, true ) . "\n"
-		);
+			"argv: " . var_export( $argv, true ) . "\n";
 }
 
-- 
cgit v1.2.3-54-g00ecf