https://www.mediawiki.org/wiki/Special:Code/MediaWiki/113974
Revision: 113974
Author: catrope
Date: 2012-03-15 23:17:03 +0000 (Thu, 15 Mar 2012)
Log Message:
-----------
1.19wmf1: MFT r113962
Modified Paths:
--------------
branches/wmf/1.19wmf1/extensions/ArticleFeedbackv5/ArticleFeedbackv5.hooks.php
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,113858,113960
+ /branches/REL1_18/extensions/ArticleFeedback:97350
/trunk/extensions/ArticleFeedbackv5:113626,113628,113858,113960,113962
Modified:
branches/wmf/1.19wmf1/extensions/ArticleFeedbackv5/ArticleFeedbackv5.hooks.php
===================================================================
---
branches/wmf/1.19wmf1/extensions/ArticleFeedbackv5/ArticleFeedbackv5.hooks.php
2012-03-15 23:10:53 UTC (rev 113973)
+++
branches/wmf/1.19wmf1/extensions/ArticleFeedbackv5/ArticleFeedbackv5.hooks.php
2012-03-15 23:17:03 UTC (rev 113974)
@@ -442,7 +442,8 @@
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(),
$baseRevId );
+ $revID = $revision instanceof Revision ? $revision->getID() : 0;
+ self::trackEvent( 'edit_success', $article->getTitle(), $revID
);
return 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,113858,113960
+
/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,113960,113962
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
