diff options
| author | Pierre Schmitz <pierre@archlinux.de> | 2014-01-14 19:24:18 +0100 |
|---|---|---|
| committer | Pierre Schmitz <pierre@archlinux.de> | 2014-01-14 19:24:18 +0100 |
| commit | 224b22a051051f6c2e494c3a2fb4adb42898e2d1 (patch) | |
| tree | 85a41a4cf8533bf740ec4c8d3affce88414daa56 /extensions/SyntaxHighlight_GeSHi/geshi | |
| parent | 9937b8e6d6a8b4517c04c143daaf9ebd42ce8ba0 (diff) | |
Update to MediaWiki 1.22.1
Diffstat (limited to 'extensions/SyntaxHighlight_GeSHi/geshi')
| -rw-r--r-- | extensions/SyntaxHighlight_GeSHi/geshi/geshi.php | 2 | ||||
| -rw-r--r-- | extensions/SyntaxHighlight_GeSHi/geshi/geshi/haskell.php | 10 |
2 files changed, 2 insertions, 10 deletions
diff --git a/extensions/SyntaxHighlight_GeSHi/geshi/geshi.php b/extensions/SyntaxHighlight_GeSHi/geshi/geshi.php index 4323d05c..60741577 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-wmf1'); // WMF fix for Haskell (bug 52509) +define('GESHI_VERSION', '1.0.8.11'); // 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 d3b494ed..adae1116 100644 --- a/extensions/SyntaxHighlight_GeSHi/geshi/geshi/haskell.php +++ b/extensions/SyntaxHighlight_GeSHi/geshi/geshi/haskell.php @@ -13,14 +13,6 @@ * ------- * 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) * ------------------------- @@ -54,7 +46,7 @@ $language_data = array ( 3 => "/{-(?:(?R)|.)-}/s", //Nested Comments ), 'CASE_KEYWORDS' => 0, - 'QUOTEMARKS' => array('"'), // SyntaxHighlight_GeSHi modification; see CHANGES above. + 'QUOTEMARKS' => array('"',"'"), 'ESCAPE_CHAR' => '\\', 'KEYWORDS' => array( /* main haskell keywords */ |