summaryrefslogtreecommitdiff
path: root/extensions/SyntaxHighlight_GeSHi/geshi
diff options
context:
space:
mode:
authorPierre Schmitz <pierre@archlinux.de>2013-12-08 09:55:49 +0100
committerPierre Schmitz <pierre@archlinux.de>2013-12-08 09:55:49 +0100
commit4ac9fa081a7c045f6a9f1cfc529d82423f485b2e (patch)
treeaf68743f2f4a47d13f2b0eb05f5c4aaf86d8ea37 /extensions/SyntaxHighlight_GeSHi/geshi
parentaf4da56f1ad4d3ef7b06557bae365da2ea27a897 (diff)
Update to MediaWiki 1.22.0
Diffstat (limited to 'extensions/SyntaxHighlight_GeSHi/geshi')
-rw-r--r--extensions/SyntaxHighlight_GeSHi/geshi/geshi.php2
-rw-r--r--extensions/SyntaxHighlight_GeSHi/geshi/geshi/haskell.php10
2 files changed, 10 insertions, 2 deletions
diff --git a/extensions/SyntaxHighlight_GeSHi/geshi/geshi.php b/extensions/SyntaxHighlight_GeSHi/geshi/geshi.php
index 60741577..4323d05c 100644
--- a/extensions/SyntaxHighlight_GeSHi/geshi/geshi.php
+++ b/extensions/SyntaxHighlight_GeSHi/geshi/geshi.php
@@ -41,7 +41,7 @@
//
/** The version of this GeSHi file */
-define('GESHI_VERSION', '1.0.8.11');
+define('GESHI_VERSION', '1.0.8.11-wmf1'); // WMF fix for Haskell (bug 52509)
// Define the root directory for the GeSHi code tree
if (!defined('GESHI_ROOT')) {
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 */