https://www.mediawiki.org/wiki/Special:Code/MediaWiki/111869
Revision: 111869
Author: wikinaut
Date: 2012-02-19 16:25:15 +0000 (Sun, 19 Feb 2012)
Log Message:
-----------
moved wgEtherpadLite default parameters out of the class to make them really
global superdefaults
Modified Paths:
--------------
trunk/extensions/EtherpadLite/EtherpadLite.php
Modified: trunk/extensions/EtherpadLite/EtherpadLite.php
===================================================================
--- trunk/extensions/EtherpadLite/EtherpadLite.php 2012-02-19 15:51:08 UTC
(rev 111868)
+++ trunk/extensions/EtherpadLite/EtherpadLite.php 2012-02-19 16:25:15 UTC
(rev 111869)
@@ -70,43 +70,43 @@
);
$dir = dirname( __FILE__ ) . '/';
-
$wgExtensionMessagesFiles['EtherpadLite'] = $dir . 'EtherpadLite.i18n.php';
$wgHooks['ParserFirstCallInit'][] = 'EtherpadLite::EtherpadLiteParserInit';
-class EtherpadLite {
+# Define a default Etherpad Lite server Url and base path
+# this server is used unless a distinct server is defined by id="..."
+$wgEtherpadLiteDefaultPadUrl = "http://beta.etherpad.org/p/";;
- # Define a default Etherpad Lite server Url and base path
- # this server is used unless a distinct server is defined by id="..."
- public $wgEtherpadLiteDefaultPadUrl = "http://beta.etherpad.org/p/";;
+$wgEtherpadLiteDefaultWidth = "300px";
+$wgEtherpadLiteDefaultHeight = "200px";
+$wgEtherpadLiteMonospacedFont = false;
+$wgEtherpadLiteShowControls = true;
+$wgEtherpadLiteShowLineNumbers = true;
+$wgEtherpadLiteShowChat = true;
+$wgEtherpadLiteShowAuthorColors = true;
- public $wgEtherpadLiteDefaultWidth = "300px";
- public $wgEtherpadLiteDefaultHeight = "200px";
- public $wgEtherpadLiteMonospacedFont = false;
- public $wgEtherpadLiteShowControls = true;
- public $wgEtherpadLiteShowLineNumbers = true;
- public $wgEtherpadLiteShowChat = true;
- public $wgEtherpadLiteShowAuthorColors = true;
+# Whitelist of allowed Etherpad Lite server Urls
+#
+# If there are items in the array, and the user supplied URL is not in the
array,
+# the url will not be allowed (proposed in bug 27768 for Extension:RSS)
+# Attention:
+# Urls are case-sensitively tested against values in the array.
+# They must exactly match including any trailing "/" character.
+#
+# Warning: Allowing all urls (not setting a whitelist)
+# may be a security concern.
+#
+# an empty or non-existent array means: no whitelist defined
+# this is the default: an empty whitelist. No servers are allowed by default.
- # Whitelist of allowed Etherpad Lite server Urls
- #
- # If there are items in the array, and the user supplied URL is not in
the array,
- # the url will not be allowed (proposed in bug 27768 for Extension:RSS)
- # Attention:
- # Urls are case-sensitively tested against values in the array.
- # They must exactly match including any trailing "/" character.
- #
- # Warning: Allowing all urls (not setting a whitelist)
- # may be a security concern.
- #
- # an empty or non-existent array means: no whitelist defined
- # this is the default: an empty whitelist. No servers are allowed by
default.
+$wgEtherpadLiteUrlWhitelist = array();
- public $wgEtherpadLiteUrlWhitelist = array();
-
- # include "*" if you expressly want to allow all urls (you should not
do this)
- # $wgEtherpadLiteUrlWhitelist = array( "*" );
+# include "*" if you expressly want to allow all urls (you should not do this)
+# $wgEtherpadLiteUrlWhitelist = array( "*" );
+
+class EtherpadLite {
+
/**
* Tell the parser how to handle <eplite> elements
* https://www.mediawiki.org/wiki/Manual:Tag_extensions
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
