From 4ac9fa081a7c045f6a9f1cfc529d82423f485b2e Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Sun, 8 Dec 2013 09:55:49 +0100
Subject: Update to MediaWiki 1.22.0

---
 extensions/SyntaxHighlight_GeSHi/geshi/geshi/haskell.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'extensions/SyntaxHighlight_GeSHi/geshi/geshi/haskell.php')

diff --git a/extensions/SyntaxHighlight_GeSHi/geshi/geshi/haskell.php b/extensions/SyntaxHighlight_GeSHi/geshi/geshi/haskell.php
index adae1116..d3b494ed 100644
--- a/extensions/SyntaxHighlight_GeSHi/geshi/geshi/haskell.php
+++ b/extensions/SyntaxHighlight_GeSHi/geshi/geshi/haskell.php
@@ -13,6 +13,14 @@
  * -------
  * 2005/08/27 (1.0.0)
  *   -  First Release
+ * 2013/09/28
+ *   -  Single quotes dropped from QUOTEMARKS to resolve <https://bugzilla.wikimedia.org/52509>.
+ *      Change is local to SyntaxHighlight_GeSHi, made by Ori Livneh (ori@wikimedia.org), based
+ *      on a proposed upstream patch.
+ *      Upstream bug report:
+ *        <http://sourceforge.net/p/geshi/bugs/217/>
+ *      Upstream patch (stalled since 2012):
+ *        <http://sourceforge.net/p/geshi/bugs/219/>
  *
  * TODO (updated 2005/08/27)
  * -------------------------
@@ -46,7 +54,7 @@ $language_data = array (
         3 => "/{-(?:(?R)|.)-}/s", //Nested Comments
         ),
     'CASE_KEYWORDS' => 0,
-    'QUOTEMARKS' => array('"',"'"),
+    'QUOTEMARKS' => array('"'),  // SyntaxHighlight_GeSHi modification; see CHANGES above.
     'ESCAPE_CHAR' => '\\',
     'KEYWORDS' => array(
         /* main haskell keywords */
-- 
cgit v1.2.2