| Index: trunk/extensions/EtherpadLite/EtherpadLite.php |
| — | — | @@ -64,7 +64,7 @@ |
| 65 | 65 | 'path' => __FILE__, |
| 66 | 66 | 'name' => 'EtherpadLite', |
| 67 | 67 | 'author' => array( 'Thomas Gries' ), |
| 68 | | - 'version' => '1.12 20120309', |
| | 68 | + 'version' => '1.13 20120319', |
| 69 | 69 | 'url' => 'https://www.mediawiki.org/wiki/Extension:EtherpadLite', |
| 70 | 70 | 'descriptionmsg' => 'etherpadlite-desc', |
| 71 | 71 | ); |
| — | — | @@ -104,20 +104,3 @@ |
| 105 | 105 | |
| 106 | 106 | # include "*" if you expressly want to allow all urls (you should not do this) |
| 107 | 107 | # $wgEtherpadLiteUrlWhitelist = array( "*" ); |
| 108 | | - |
| 109 | | -// If you want to see images in feed items, then you need to globally allow |
| 110 | | -// image tags in your wiki by using the MediaWiki parameter; default: false |
| 111 | | -// $wgAllowImageTag = true; |
| 112 | | - |
| 113 | | -// Parameter to enable the automatic tracking category |
| 114 | | -// for all pages using this parser extension |
| 115 | | -// |
| 116 | | -// Category name [[MediaWiki:etherpadlite-tracking-category]] (default) |
| 117 | | -// $wgEtherpadLiteTrackingCategory = true; |
| 118 | | -// |
| 119 | | -// you can assign a specific category name [[MediaWiki:Etherpadlite-mycategory]] |
| 120 | | -// $wgEtherpadLiteTrackingCategory = 'etherpadlite-mycategory'; |
| 121 | | -// |
| 122 | | -// you can disable the use of a tracking category |
| 123 | | -// $wgEtherpadLiteTrackingCategory = false; |
| 124 | | -$wgEtherpadLiteTrackingCategory = true; |
| Index: trunk/extensions/EtherpadLite/EtherpadLite_body.php |
| — | — | @@ -39,7 +39,7 @@ |
| 40 | 40 | global $wgEtherpadLiteDefaultPadUrl, $wgEtherpadLiteDefaultWidth, $wgEtherpadLiteDefaultHeight, |
| 41 | 41 | $wgEtherpadLiteMonospacedFont, $wgEtherpadLiteShowControls, $wgEtherpadLiteShowLineNumbers, |
| 42 | 42 | $wgEtherpadLiteShowChat, $wgEtherpadLiteShowAuthorColors, $wgEtherpadLiteUrlWhitelist, |
| 43 | | - $wgEtherpadLitePadsOnThisPage, $wgEtherpadLiteTrackingCategory; |
| | 43 | + $wgEtherpadLitePadsOnThisPage; |
| 44 | 44 | |
| 45 | 45 | # check the user input |
| 46 | 46 | |
| — | — | @@ -166,16 +166,8 @@ |
| 167 | 167 | $sanitizedAttributes |
| 168 | 168 | ); |
| 169 | 169 | |
| 170 | | - wfDebug( "EtherpadLite::EtherpadLiteRender $output\n" ); |
| 171 | | - |
| 172 | | - if ( $wgEtherpadLiteTrackingCategory === true ) { |
| 173 | | - $parser->addTrackingCategory( 'etherpadlite-tracking-category' ); |
| 174 | | - } elseif ( is_string( $wgEtherpadLiteTrackingCategory ) ) { |
| 175 | | - $parser->addTrackingCategory( $wgEtherpadLiteTrackingCategory ); |
| 176 | | - } |
| 177 | | - |
| | 170 | + $parser->addTrackingCategory( 'etherpadlite-tracking-category' ); |
| 178 | 171 | return $output; |
| 179 | | - |
| 180 | 172 | } |
| 181 | 173 | |
| 182 | 174 | /** |