From 81be3ba123fa26c29ab157288530ffaec9d0930f Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Thu, 22 Mar 2012 21:04:56 +0100
Subject: Update to MediaWiki 1.18.2

---
 includes/parser/StripState.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'includes/parser/StripState.php')

diff --git a/includes/parser/StripState.php b/includes/parser/StripState.php
index 357dc2c8..a6eff70e 100644
--- a/includes/parser/StripState.php
+++ b/includes/parser/StripState.php
@@ -174,5 +174,15 @@ class StripState {
 		$key = $m[1];
 		return "{$this->prefix}{$this->tempMergePrefix}-$key" . Parser::MARKER_SUFFIX;
 	}
+
+	/**
+	 * Remove any strip markers found in the given text.
+	 *
+	 * @param $text Input string
+	 * @return string
+	 */
+	function killMarkers( $text ) {
+		return preg_replace( $this->regex, '', $text );
+	}
 }
 
-- 
cgit v1.2.2