jenkins-bot has submitted this change and it was merged.

Change subject: Support 'inline' as an alias for 'enclose="none"'
......................................................................


Support 'inline' as an alias for 'enclose="none"'

I think it's easier to understand and easier to remember.

Change-Id: I3c0e8bc209956b8d2ba071baa40142c731f56524
---
M SyntaxHighlight_GeSHi.class.php
1 file changed, 2 insertions(+), 1 deletion(-)

Approvals:
  Aaron Schulz: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/SyntaxHighlight_GeSHi.class.php b/SyntaxHighlight_GeSHi.class.php
index b09aae4..314eeac 100644
--- a/SyntaxHighlight_GeSHi.class.php
+++ b/SyntaxHighlight_GeSHi.class.php
@@ -153,7 +153,8 @@
                        $lexer = null;
                }
 
-               $inline = isset( $args['enclose'] ) && $args['enclose'] === 
'none';
+               $inline = ( isset( $args['enclose'] ) && $args['enclose'] === 
'none' )
+                       || isset( $args['inline'] );
                $attrs = array( 'class' => self::HIGHLIGHT_CSS_CLASS );
 
                if ( $lexer === null ) {

-- 
To view, visit https://gerrit.wikimedia.org/r/220150
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I3c0e8bc209956b8d2ba071baa40142c731f56524
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/SyntaxHighlight_GeSHi
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh <o...@wikimedia.org>
Gerrit-Reviewer: Aaron Schulz <asch...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to