https://www.mediawiki.org/wiki/Special:Code/MediaWiki/111271
Revision: 111271
Author: reedy
Date: 2012-02-11 23:53:55 +0000 (Sat, 11 Feb 2012)
Log Message:
-----------
Fix global typo
Fix whitespace, remove unused global that wasn't defined
Modified Paths:
--------------
trunk/extensions/EtherpadLite/EtherpadLite.php
Modified: trunk/extensions/EtherpadLite/EtherpadLite.php
===================================================================
--- trunk/extensions/EtherpadLite/EtherpadLite.php 2012-02-11 23:46:37 UTC
(rev 111270)
+++ trunk/extensions/EtherpadLite/EtherpadLite.php 2012-02-11 23:53:55 UTC
(rev 111271)
@@ -73,7 +73,7 @@
// https://www.mediawiki.org/wiki/Manual:Tag_extensions
function efEtherpadLiteParser_Initialize( &$parser ) {
$parser->setHook('eplite', 'efEtherpadLiteParserFunction_Render');
- return true;
+ return true;
}
# Define a default Etherpad Lite server Url and base path
@@ -88,12 +88,11 @@
$wgEtherpadLiteShowAuthorColors = 'true';
function efEtherpadLiteParserFunction_Render( $input, $args, $parser, $frame )
{
-
+
global $wgUser;
- global $wgEtherpadLiteDefaultPadUrl,$wgEtherpadLiteDefaultWidth,
-
$wgEtherpadLiteDefaultHeigth,$wgEtherpadLiteMonospacedFont,$wgEtherpadLiteShowControls,
-
$wgEtherpadLiteShowLineNumbers,$wgEtherpadLiteShowChat,$wgEtherpadLiteUserName,
- $wgEtherpadLiteShowAuthorColors;
+ global $wgEtherpadLiteDefaultPadUrl, $wgEtherpadLiteDefaultWidth,
$wgEtherpadLiteDefaultHeight,
+ $wgEtherpadLiteMonospacedFont, $wgEtherpadLiteShowControls,
$wgEtherpadLiteShowLineNumbers,
+ $wgEtherpadLiteShowChat, $wgEtherpadLiteShowAuthorColors;
$padId = ( !empty( $args['pad-id'] ) ) ? $args['pad-id'] :
"" ;
$height = ( !empty( $args['height'] ) ) ? $args['height'] :
$wgEtherpadLiteDefaultHeight;
@@ -104,17 +103,17 @@
$showLineNumbers = ( !empty( $args['show-linenumbers'] ) ) ?
$args['show-linenumbers'] : $wgEtherpadLiteShowLineNumbers;
$showChat = ( !empty( $args['show-chat'] ) ) ?
$args['show-chat'] : $wgEtherpadLiteShowChat;
$noColors = ! ( ( !empty( $args['show-colors'] ) ) ?
$args['show-colors'] : $wgEtherpadLiteShowAuthorColors );
-
+
$epliteHostUrl = Sanitizer::cleanUrl (
( !empty( $args['pad-url'] ) ) ? $args['pad-url'] :
$wgEtherpadLiteDefaultPadUrl
- );
+ );
// preset the pad username from MediaWiki username or IP
// attention:
// the pad username can currently be overwritten when editing the pad
$userName = $wgUser->getName();
-
+
$iframeAttributes = array(
"style" => "width:$width;height:$height",
"id" => "epframe$padId",
@@ -126,10 +125,9 @@
"&userName=$userName" .
"&noColors=$noColors"
);
-
+
$output = Html::rawElement( 'iframe', $iframeAttributes );
-
+
wfDebug( "EtherpadLite:efEtherpadLiteParserFunction_Render $output\n" );
return array( $output, 'noparse' => true, 'isHTML' => true );
-
}
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
