From 7bf2eb8ba09b54cec804446ea39a3e658773fac9 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Sat, 21 May 2016 08:33:14 +0200
Subject: Update to MediaWiki 1.26.3

---
 extensions/SyntaxHighlight_GeSHi/SyntaxHighlight_GeSHi.class.php | 5 ++++-
 extensions/SyntaxHighlight_GeSHi/tests/parserTests.txt           | 9 +++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

(limited to 'extensions')

diff --git a/extensions/SyntaxHighlight_GeSHi/SyntaxHighlight_GeSHi.class.php b/extensions/SyntaxHighlight_GeSHi/SyntaxHighlight_GeSHi.class.php
index 9eed2763..e2da350b 100644
--- a/extensions/SyntaxHighlight_GeSHi/SyntaxHighlight_GeSHi.class.php
+++ b/extensions/SyntaxHighlight_GeSHi/SyntaxHighlight_GeSHi.class.php
@@ -111,8 +111,11 @@ class SyntaxHighlight_GeSHi {
 	public static function parserHook( $text, $args = array(), $parser ) {
 		global $wgUseTidy;
 
+		// Replace strip markers (For e.g. {{#tag:syntaxhighlight|<nowiki>...}})
+		$out = $parser->mStripState->unstripNoWiki( $text );
+
 		// Don't trim leading spaces away, just the linefeeds
-		$out = preg_replace( '/^\n+/', '', rtrim( $text ) );
+		$out = preg_replace( '/^\n+/', '', rtrim( $out ) );
 
 		// Convert deprecated attributes
 		if ( isset( $args['enclose'] ) ) {
diff --git a/extensions/SyntaxHighlight_GeSHi/tests/parserTests.txt b/extensions/SyntaxHighlight_GeSHi/tests/parserTests.txt
index c6aaa9a4..5d5038c9 100644
--- a/extensions/SyntaxHighlight_GeSHi/tests/parserTests.txt
+++ b/extensions/SyntaxHighlight_GeSHi/tests/parserTests.txt
@@ -154,3 +154,12 @@ Text <source lang="javascript" enclose="none">var a;</source>.
 <p>Text <code class="mw-highlight" dir="ltr"><span class="kd">var</span> <span class="nx">a</span><span class="p">;</span></code>.
 </p>
 !! end
+
+!! test
+Enclose with nowiki
+!! input
+{{#tag:syntaxhighlight|<nowiki>foo</nowiki>|lang="text"|inline=none}}
+!! result
+<p><code class="mw-highlight" dir="ltr">foo</code>
+</p>
+!! end
-- 
cgit v1.2.3-54-g00ecf


From 788cb78c4c2ab6606c731f45b5d0238ac2080da0 Mon Sep 17 00:00:00 2001
From: Florian Pritz <bluewind@xinu.at>
Date: Thu, 16 Jun 2016 13:11:10 +0200
Subject: Add AbuseFilter and CheckUser

Requested by Jason

Signed-off-by: Florian Pritz <bluewind@xinu.at>
---
 .gitmodules            | 6 ++++++
 extensions/AbuseFilter | 1 +
 extensions/CheckUser   | 1 +
 3 files changed, 8 insertions(+)
 create mode 100644 .gitmodules
 create mode 160000 extensions/AbuseFilter
 create mode 160000 extensions/CheckUser

(limited to 'extensions')

diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 00000000..fc47ad4e
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,6 @@
+[submodule "extensions/CheckUser"]
+	path = extensions/CheckUser
+	url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/CheckUser.git
+[submodule "extensions/AbuseFilter"]
+	path = extensions/AbuseFilter
+	url = https://github.com/wikimedia/mediawiki-extensions-AbuseFilter.git
diff --git a/extensions/AbuseFilter b/extensions/AbuseFilter
new file mode 160000
index 00000000..063ac925
--- /dev/null
+++ b/extensions/AbuseFilter
@@ -0,0 +1 @@
+Subproject commit 063ac925a80b7a87dbdd21b7acec8177efdac3d7
diff --git a/extensions/CheckUser b/extensions/CheckUser
new file mode 160000
index 00000000..c149e123
--- /dev/null
+++ b/extensions/CheckUser
@@ -0,0 +1 @@
+Subproject commit c149e123ffd2d972b8a31374f502e424fa03ef61
-- 
cgit v1.2.3-54-g00ecf


From b62fd6a871dcdd00c642c3cad4a167c24e6e2c33 Mon Sep 17 00:00:00 2001
From: Jakub Klinkovský <j.l.k@gmx.com>
Date: Thu, 14 Jul 2016 10:35:38 +0200
Subject: Use specific release of AbuseFilter and CheckUser extensions

---
 .gitmodules            | 2 ++
 extensions/AbuseFilter | 2 +-
 extensions/CheckUser   | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'extensions')

diff --git a/.gitmodules b/.gitmodules
index fc47ad4e..d4d6a6c5 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,8 @@
 [submodule "extensions/CheckUser"]
 	path = extensions/CheckUser
 	url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/CheckUser.git
+	branch = REL1_26
 [submodule "extensions/AbuseFilter"]
 	path = extensions/AbuseFilter
 	url = https://github.com/wikimedia/mediawiki-extensions-AbuseFilter.git
+	branch = REL1_26
diff --git a/extensions/AbuseFilter b/extensions/AbuseFilter
index 063ac925..e4e82228 160000
--- a/extensions/AbuseFilter
+++ b/extensions/AbuseFilter
@@ -1 +1 @@
-Subproject commit 063ac925a80b7a87dbdd21b7acec8177efdac3d7
+Subproject commit e4e82228a8af22fc423b282de36a970412e94a9f
diff --git a/extensions/CheckUser b/extensions/CheckUser
index c149e123..710d3020 160000
--- a/extensions/CheckUser
+++ b/extensions/CheckUser
@@ -1 +1 @@
-Subproject commit c149e123ffd2d972b8a31374f502e424fa03ef61
+Subproject commit 710d30200318f1e8ec579bf0d07b07acbb105b5f
-- 
cgit v1.2.3-54-g00ecf