https://www.mediawiki.org/wiki/Special:Code/MediaWiki/113957
Revision: 113957
Author: catrope
Date: 2012-03-15 21:07:18 +0000 (Thu, 15 Mar 2012)
Log Message:
-----------
1.19wmf1: MFT r113858
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
/trunk/extensions/ArticleFeedbackv5:113626,113628
+ /branches/REL1_18/extensions/ArticleFeedback:97350
/trunk/extensions/ArticleFeedbackv5:113626,113628,113858
Modified:
branches/wmf/1.19wmf1/extensions/ArticleFeedbackv5/ArticleFeedbackv5.hooks.php
===================================================================
---
branches/wmf/1.19wmf1/extensions/ArticleFeedbackv5/ArticleFeedbackv5.hooks.php
2012-03-15 20:57:34 UTC (rev 113956)
+++
branches/wmf/1.19wmf1/extensions/ArticleFeedbackv5/ArticleFeedbackv5.hooks.php
2012-03-15 21:07:18 UTC (rev 113957)
@@ -418,7 +418,7 @@
* @return bool
*/
public static function trackEditAttempt( $editpage ) {
- self::trackEvent( 'edit_attempt',
$editpage->getArticle()->getTitle() ); // EditPage::getTitle() doesn't exist in
1.18wmf1
+ self::trackEvent( 'edit_attempt',
$editpage->getArticle()->getTitle(), $editpage->getRevIdFetched()); //
EditPage::getTitle() doesn't exist in 1.18wmf1
return true;
}
@@ -442,7 +442,7 @@
public static function trackEditSuccess( &$article, &$user, $text,
$summary, $minoredit, $watchthis, $sectionanchor,
&$flags,
$revision, &$status, $baseRevId /*, &$redirect */ ) {
// $redirect not passed in 1.18wmf1
- self::trackEvent( 'edit_success', $article->getTitle() );
+ self::trackEvent( 'edit_success', $article->getTitle(),
$baseRevId );
return true;
}
@@ -453,7 +453,7 @@
* @param $context IContextSource
* @return
*/
- private static function trackEvent( $event, $title ) {
+ private static function trackEvent( $event, $title, $rev_id) {
global $wgArticleFeedbackv5Tracking;
$ctas = array( 'none', 'edit', 'learn_more' );
@@ -485,7 +485,7 @@
'action' => 'clicktracking',
'eventid' => $trackingId,
'token' => $token,
- 'additional' => $title->getText(),
+ 'additional' => $title->getText() . '|' . $rev_id,
'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
/trunk/extensions/ArticleFeedbackv5/api/ApiArticleFeedbackv5.php:113626,113628
+
/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,113858
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-15 20:57:34 UTC (rev 113956)
+++
branches/wmf/1.19wmf1/extensions/ArticleFeedbackv5/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.js
2012-03-15 21:07:18 UTC (rev 113957)
@@ -3193,7 +3193,7 @@
'eventid': id,
'namespacenumber': mw.config.get( 'wgNamespaceNumber' ),
'token': $.cookie( 'clicktracking-session' ),
- 'additional': mw.config.get( 'wgTitle' ),
+ 'additional': mw.config.get( 'wgTitle' ) + '|' +
$.articleFeedbackv5.revisionId,
'redirectto': url
} );
};
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
