From 60598f4ce3b97354009b930cb9ff19b77317089d Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Fri, 26 Jul 2019 08:52:04 +0200 Subject: [PATCH] mediawiki: bring doc includer again in line with the HTMLets plug it bases on We probably always wanted to use a real HTML comment as "tag" here, but it seems the '!' was forgotten. With older mediawiki it still worked, but 1.31 got stricter and thus it was converted to HTML entities. Bring the plugin again in line with the HTMLets MediaWiki extension[0] it based on in the first place. [0]: https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/HTMLets/+/11e5ef1ea2820319458dc67174ca76d6e00b10cc/HTMLets.php#140 Signed-off-by: Thomas Lamprecht --- debian/tree/pve-docs-mediawiki/pvedocs-include.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/debian/tree/pve-docs-mediawiki/pvedocs-include.php b/debian/tree/pve-docs-mediawiki/pvedocs-include.php index f8d62d4..78a6829 100644 --- a/debian/tree/pve-docs-mediawiki/pvedocs-include.php +++ b/debian/tree/pve-docs-mediawiki/pvedocs-include.php @@ -28,7 +28,7 @@ function efPvedocsParserFunction_Setup(&$parser) { # similar code as in tag... function efPvedocsPostProcessFunction($parser, &$text) { $text = preg_replace_callback( - '/-_- @PVEDOCS_BASE64@ ([0-9a-zA-Z\\+\\/]+=*) @PVEDOCS_BASE64@ -_-/sm', + '//sm', function ($m) { return base64_decode("$m[1]"); }, $text); @@ -66,9 +66,8 @@ function efPvedocsParserFunction_Render($parser, $param1 = '', $param2 = '') { $content = file_get_contents("/usr/share/pve-docs/$param1"); - # do not use '<' or '>', it seems newer mediawiki converts it to '<' and '>' - # and then the regex for the decode in efPvedocsPostProcessFunction does not matches.. - $output = '-_- @PVEDOCS_BASE64@ '.base64_encode($content).' @PVEDOCS_BASE64@ -_-'; + # from https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/HTMLets/+/11e5ef1ea2820319458dc67174ca76d6e00b10cc/HTMLets.php#140 + $output = ''; return array($output, 'noparse' => true, 'isHTML' => true); } -- 2.39.2