| Index: branches/wmf/1.19wmf1/extensions/ArticleFeedbackv5/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.js |
| — | — | @@ -3193,7 +3193,7 @@ |
| 3194 | 3194 | 'eventid': id, |
| 3195 | 3195 | 'namespacenumber': mw.config.get( 'wgNamespaceNumber' ), |
| 3196 | 3196 | 'token': $.cookie( 'clicktracking-session' ), |
| 3197 | | - 'additional': mw.config.get( 'wgTitle' ), |
| | 3197 | + 'additional': mw.config.get( 'wgTitle' ) + '|' + $.articleFeedbackv5.revisionId, |
| 3198 | 3198 | 'redirectto': url |
| 3199 | 3199 | } ); |
| 3200 | 3200 | }; |
| Property changes on: branches/wmf/1.19wmf1/extensions/ArticleFeedbackv5/api/ApiArticleFeedbackv5.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 3201 | 3201 | Merged /trunk/extensions/ArticleFeedbackv5/api/ApiArticleFeedbackv5.php:r113858 |
| Index: branches/wmf/1.19wmf1/extensions/ArticleFeedbackv5/ArticleFeedbackv5.hooks.php |
| — | — | @@ -418,7 +418,7 @@ |
| 419 | 419 | * @return bool |
| 420 | 420 | */ |
| 421 | 421 | public static function trackEditAttempt( $editpage ) { |
| 422 | | - self::trackEvent( 'edit_attempt', $editpage->getArticle()->getTitle() ); // EditPage::getTitle() doesn't exist in 1.18wmf1 |
| | 422 | + self::trackEvent( 'edit_attempt', $editpage->getArticle()->getTitle(), $editpage->getRevIdFetched()); // EditPage::getTitle() doesn't exist in 1.18wmf1 |
| 423 | 423 | return true; |
| 424 | 424 | } |
| 425 | 425 | |
| — | — | @@ -442,7 +442,7 @@ |
| 443 | 443 | public static function trackEditSuccess( &$article, &$user, $text, |
| 444 | 444 | $summary, $minoredit, $watchthis, $sectionanchor, &$flags, |
| 445 | 445 | $revision, &$status, $baseRevId /*, &$redirect */ ) { // $redirect not passed in 1.18wmf1 |
| 446 | | - self::trackEvent( 'edit_success', $article->getTitle() ); |
| | 446 | + self::trackEvent( 'edit_success', $article->getTitle(), $baseRevId ); |
| 447 | 447 | return true; |
| 448 | 448 | } |
| 449 | 449 | |
| — | — | @@ -453,7 +453,7 @@ |
| 454 | 454 | * @param $context IContextSource |
| 455 | 455 | * @return |
| 456 | 456 | */ |
| 457 | | - private static function trackEvent( $event, $title ) { |
| | 457 | + private static function trackEvent( $event, $title, $rev_id) { |
| 458 | 458 | global $wgArticleFeedbackv5Tracking; |
| 459 | 459 | $ctas = array( 'none', 'edit', 'learn_more' ); |
| 460 | 460 | |
| — | — | @@ -485,7 +485,7 @@ |
| 486 | 486 | 'action' => 'clicktracking', |
| 487 | 487 | 'eventid' => $trackingId, |
| 488 | 488 | 'token' => $token, |
| 489 | | - 'additional' => $title->getText(), |
| | 489 | + 'additional' => $title->getText() . '|' . $rev_id, |
| 490 | 490 | 'namespacenumber' => $title->getNamespace() |
| 491 | 491 | ) ); |
| 492 | 492 | $api = new ApiMain( $params, true ); |
| Property changes on: branches/wmf/1.19wmf1/extensions/ArticleFeedbackv5 |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 493 | 493 | Merged /trunk/extensions/ArticleFeedbackv5:r113858 |