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); }