Gergő Tisza has uploaded a new change for review.
https://gerrit.wikimedia.org/r/245581
Change subject: [DO NOT MERGE] Fix SyntaxHighlight incompatibility
......................................................................
[DO NOT MERGE] Fix SyntaxHighlight incompatibility
This is a workaround for vagrant breaking when a module is imported
due to Scribunto calling SyntaxHighligh in a deprecated way.
Depends on Ide7ab4b84d1aacad2db8400de9e350a09c80e8c0.
Bug: T109873
Change-Id: I2d518b5412efbe4e8ddb43e7c465ea55dc44b1a3
---
M common/ScribuntoContent.php
1 file changed, 3 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Scribunto
refs/changes/81/245581/1
diff --git a/common/ScribuntoContent.php b/common/ScribuntoContent.php
index 65deee7..23e4bbf 100644
--- a/common/ScribuntoContent.php
+++ b/common/ScribuntoContent.php
@@ -120,21 +120,13 @@
// Add HTML for the actual script
$language = $engine->getGeSHiLanguage();
if ( $wgScribuntoUseGeSHi && $language ) {
- $geshi = SyntaxHighlight_GeSHi::prepare( $text,
$language );
+ $geshi = new GeSHi( SyntaxHighlight_GeSHi::highlight(
+ $text, $lang )->getValue() );
$geshi->set_language( $language );
if ( $geshi instanceof GeSHi && !$geshi->error() ) {
$code = $geshi->parse_code();
if ( $code ) {
- // @todo Once we drop support for old
versions of
- // Extension:SyntaxHighlight_GeSHi,
drop the ugly test and
- // the BC case.
- global $wgAutoloadClasses;
- if ( isset(
$wgAutoloadClasses['ResourceLoaderGeSHiModule'] ) ) {
- $output->addModuleStyles(
"ext.geshi.language.$language" );
- } else {
- // Backwards compatibility
- $output->addHeadItem(
SyntaxHighlight_GeSHi::buildHeadItem( $geshi ), "source-{$language}" );
- }
+ $output->addModuleStyles(
"ext.geshi.language.$language" );
if ( $wgUseSiteCss ) {
$output->addModuleStyles(
'ext.geshi.local' );
}
--
To view, visit https://gerrit.wikimedia.org/r/245581
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2d518b5412efbe4e8ddb43e7c465ea55dc44b1a3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Scribunto
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
