| Index: trunk/extensions/AJAXPoll/AJAXPoll_body.php |
| — | — | @@ -30,17 +30,11 @@ |
| 31 | 31 | |
| 32 | 32 | # The callback function for converting the input text to HTML output |
| 33 | 33 | static function AJAXPollRender( $input, $params = array(), Parser $parser ) { |
| 34 | | - global $wgUser, $wgOut, $wgTitle, $wgScriptPath, $wgUseAjax, |
| 35 | | - $wgAJAXPollTrackingCategory; |
| | 34 | + global $wgUser, $wgOut, $wgTitle, $wgScriptPath, $wgUseAjax; |
| 36 | 35 | |
| 37 | 36 | $parser->disableCache(); |
| | 37 | + $parser->addTrackingCategory( 'ajaxpoll-tracking-category' ); |
| 38 | 38 | |
| 39 | | - if ( $wgAJAXPollTrackingCategory === true ) { |
| 40 | | - $parser->addTrackingCategory( 'ajaxpoll-tracking-category' ); |
| 41 | | - } elseif ( is_string( $wgAJAXPollTrackingCategory ) ) { |
| 42 | | - $parser->addTrackingCategory( $wgAJAXPollTrackingCategory ); |
| 43 | | - } |
| 44 | | - |
| 45 | 39 | if ( $wgUser->getName() == '' ) { |
| 46 | 40 | $user = wfGetIP(); |
| 47 | 41 | } else { |
| Index: trunk/extensions/AJAXPoll/AJAXPoll.php |
| — | — | @@ -19,7 +19,7 @@ |
| 20 | 20 | * @author Jack Phoenix <jack@countervandalism.net> |
| 21 | 21 | * @author Thomas Gries |
| 22 | 22 | * @maintainer Thomas Gries |
| 23 | | - * @version 1.77 |
| | 23 | + * @version 1.78 |
| 24 | 24 | * @link http://www.mediawiki.org/wiki/Extension:AJAX_Poll Documentation |
| 25 | 25 | */ |
| 26 | 26 | |
| — | — | @@ -31,7 +31,7 @@ |
| 32 | 32 | $wgExtensionCredits['parserhook'][] = array( |
| 33 | 33 | 'path' => __FILE__, |
| 34 | 34 | 'name' => 'AJAX Poll', |
| 35 | | - 'version' => '1.77 20120318', |
| | 35 | + 'version' => '1.78 20120319', |
| 36 | 36 | 'author' => array( 'Dariusz Siedlecki', 'Jack Phoenix', 'Thomas Gries' ), |
| 37 | 37 | 'descriptionmsg' => 'ajaxpoll-desc', |
| 38 | 38 | 'url' => 'https://www.mediawiki.org/wiki/Extension:AJAX_Poll', |
| — | — | @@ -70,16 +70,3 @@ |
| 71 | 71 | # in your LocalSettings.php after calling the AJAXPoll extension: |
| 72 | 72 | # $wgGroupPermissions['*']['ajaxpoll-vote'] = false; |
| 73 | 73 | # $wgGroupPermissions['user']['ajaxpoll-vote'] = true; |
| 74 | | - |
| 75 | | -// Parameter to enable the automatic tracking category |
| 76 | | -// for all pages using this parser extension |
| 77 | | -// |
| 78 | | -// Category name [[MediaWiki:Ajaxpoll-tracking-category]] (default) |
| 79 | | -// $wgAJAXPollTrackingCategory = true; |
| 80 | | -// |
| 81 | | -// you can assign a specific category name [[MediaWiki:Ajaxpoll-mycategory]] |
| 82 | | -// $wgAJAXPollTrackingCategory = 'ajaxpoll-mycategory'; |
| 83 | | -// |
| 84 | | -// you can disable the use of a tracking category |
| 85 | | -// $wgAJAXPollTrackingCategory = false; |
| 86 | | -$wgAJAXPollTrackingCategory = true; |