https://www.mediawiki.org/wiki/Special:Code/MediaWiki/113671
Revision: 113671
Author: catrope
Date: 2012-03-12 21:37:15 +0000 (Mon, 12 Mar 2012)
Log Message:
-----------
1.19wmf1: MFT r113626, r113628
Modified Paths:
--------------
branches/wmf/1.19wmf1/extensions/ArticleFeedbackv5/ArticleFeedbackv5.hooks.php
branches/wmf/1.19wmf1/extensions/ArticleFeedbackv5/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.js
Property Changed:
----------------
branches/wmf/1.19wmf1/extensions/ArticleFeedbackv5/
branches/wmf/1.19wmf1/extensions/ArticleFeedbackv5/api/ApiArticleFeedbackv5.php
Property changes on: branches/wmf/1.19wmf1/extensions/ArticleFeedbackv5
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_18/extensions/ArticleFeedback:97350
+ /branches/REL1_18/extensions/ArticleFeedback:97350
/trunk/extensions/ArticleFeedbackv5:113626,113628
Modified:
branches/wmf/1.19wmf1/extensions/ArticleFeedbackv5/ArticleFeedbackv5.hooks.php
===================================================================
---
branches/wmf/1.19wmf1/extensions/ArticleFeedbackv5/ArticleFeedbackv5.hooks.php
2012-03-12 21:35:52 UTC (rev 113670)
+++
branches/wmf/1.19wmf1/extensions/ArticleFeedbackv5/ArticleFeedbackv5.hooks.php
2012-03-12 21:37:15 UTC (rev 113671)
@@ -485,7 +485,7 @@
'action' => 'clicktracking',
'eventid' => $trackingId,
'token' => $token,
- 'info' => $title->getText(),
+ 'additional' => $title->getText(),
'namespacenumber' => $title->getNamespace()
) );
$api = new ApiMain( $params, true );
Property changes on:
branches/wmf/1.19wmf1/extensions/ArticleFeedbackv5/api/ApiArticleFeedbackv5.php
___________________________________________________________________
Modified: svn:mergeinfo
-
/branches/REL1_18/extensions/ArticleFeedback/api/ApiArticleFeedback.php:97350
/trunk/extensions/ArticleFeedback/api/ApiArticleFeedback.php:76964,77627
+
/branches/REL1_18/extensions/ArticleFeedback/api/ApiArticleFeedback.php:97350
/trunk/extensions/ArticleFeedback/api/ApiArticleFeedback.php:76964,77627
/trunk/extensions/ArticleFeedbackv5/api/ApiArticleFeedbackv5.php:113626,113628
Modified:
branches/wmf/1.19wmf1/extensions/ArticleFeedbackv5/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.js
===================================================================
---
branches/wmf/1.19wmf1/extensions/ArticleFeedbackv5/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.js
2012-03-12 21:35:52 UTC (rev 113670)
+++
branches/wmf/1.19wmf1/extensions/ArticleFeedbackv5/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.js
2012-03-12 21:37:15 UTC (rev 113671)
@@ -2437,8 +2437,8 @@
* @param trackingId string the tracking ID
*/
$.articleFeedbackv5.trackingUrl = function ( url, trackingId ) {
- if ( $.articleFeedbackv5.clickTracking && $.isFunction(
$.trackActionURL ) ) {
- return $.trackActionURL( url,
$.articleFeedbackv5.prefix( trackingId ) );
+ if ( $.articleFeedbackv5.clickTracking ) {
+ return $.articleFeedbackv5.trackActionURL( url,
$.articleFeedbackv5.prefix( trackingId ) );
} else {
return url;
}
@@ -3174,6 +3174,30 @@
// }}}
+ // {{{ trackClick
+ /**
+ * Rewrites a URL to one that runs through the ClickTracking API module
+ * which registers the event and redirects to the real URL
+ *
+ * This is a copy of the one out of the clicktracking javascript API
+ * we have to do our OWN because there is no "additional" option in that
+ * API which we MUST use for the article title
+ *
+ * @param {string} url URL to redirect to
+ * @param {string} id Event identifier
+ */
+ $.articleFeedbackv5.trackActionURL = function( url, id ) {
+ return mw.config.get( 'wgScriptPath' ) + '/api.php?' + $.param(
{
+ 'action': 'clicktracking',
+ 'format' : 'json',
+ 'eventid': id,
+ 'namespacenumber': mw.config.get( 'wgNamespaceNumber' ),
+ 'token': $.cookie( 'clicktracking-session' ),
+ 'additional': mw.config.get( 'wgTitle' ),
+ 'redirectto': url
+ } );
+ };
+
// }}}
// }}}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
