https://www.mediawiki.org/wiki/Special:Code/MediaWiki/114166
Revision: 114166
Author: wikinaut
Date: 2012-03-19 18:45:57 +0000 (Mon, 19 Mar 2012)
Log Message:
-----------
removed the redundant code for handling tracking categories. By using '-' for
the message text ajaxpoll-tracking-category , this can be disabled easily.
Modified Paths:
--------------
trunk/extensions/AJAXPoll/AJAXPoll.php
trunk/extensions/AJAXPoll/AJAXPoll_body.php
Modified: trunk/extensions/AJAXPoll/AJAXPoll.php
===================================================================
--- trunk/extensions/AJAXPoll/AJAXPoll.php 2012-03-19 18:41:29 UTC (rev
114165)
+++ trunk/extensions/AJAXPoll/AJAXPoll.php 2012-03-19 18:45:57 UTC (rev
114166)
@@ -19,7 +19,7 @@
* @author Jack Phoenix <j...@countervandalism.net>
* @author Thomas Gries
* @maintainer Thomas Gries
- * @version 1.77
+ * @version 1.78
* @link http://www.mediawiki.org/wiki/Extension:AJAX_Poll Documentation
*/
@@ -31,7 +31,7 @@
$wgExtensionCredits['parserhook'][] = array(
'path' => __FILE__,
'name' => 'AJAX Poll',
- 'version' => '1.77 20120318',
+ 'version' => '1.78 20120319',
'author' => array( 'Dariusz Siedlecki', 'Jack Phoenix', 'Thomas Gries'
),
'descriptionmsg' => 'ajaxpoll-desc',
'url' => 'https://www.mediawiki.org/wiki/Extension:AJAX_Poll',
@@ -70,16 +70,3 @@
# in your LocalSettings.php after calling the AJAXPoll extension:
# $wgGroupPermissions['*']['ajaxpoll-vote'] = false;
# $wgGroupPermissions['user']['ajaxpoll-vote'] = true;
-
-// Parameter to enable the automatic tracking category
-// for all pages using this parser extension
-//
-// Category name [[MediaWiki:Ajaxpoll-tracking-category]] (default)
-// $wgAJAXPollTrackingCategory = true;
-//
-// you can assign a specific category name [[MediaWiki:Ajaxpoll-mycategory]]
-// $wgAJAXPollTrackingCategory = 'ajaxpoll-mycategory';
-//
-// you can disable the use of a tracking category
-// $wgAJAXPollTrackingCategory = false;
-$wgAJAXPollTrackingCategory = true;
Modified: trunk/extensions/AJAXPoll/AJAXPoll_body.php
===================================================================
--- trunk/extensions/AJAXPoll/AJAXPoll_body.php 2012-03-19 18:41:29 UTC (rev
114165)
+++ trunk/extensions/AJAXPoll/AJAXPoll_body.php 2012-03-19 18:45:57 UTC (rev
114166)
@@ -30,17 +30,11 @@
# The callback function for converting the input text to HTML output
static function AJAXPollRender( $input, $params = array(), Parser
$parser ) {
- global $wgUser, $wgOut, $wgTitle, $wgScriptPath, $wgUseAjax,
- $wgAJAXPollTrackingCategory;
+ global $wgUser, $wgOut, $wgTitle, $wgScriptPath, $wgUseAjax;
$parser->disableCache();
+ $parser->addTrackingCategory( 'ajaxpoll-tracking-category' );
- if ( $wgAJAXPollTrackingCategory === true ) {
- $parser->addTrackingCategory(
'ajaxpoll-tracking-category' );
- } elseif ( is_string( $wgAJAXPollTrackingCategory ) ) {
- $parser->addTrackingCategory(
$wgAJAXPollTrackingCategory );
- }
-
if ( $wgUser->getName() == '' ) {
$user = wfGetIP();
} else {
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
