[MediaWiki-CVS] SVN: [114560] branches/wmf/1.19wmf1/extensions/ClickTracking

[catrope]

https://www.mediawiki.org/wiki/Special:Code/MediaWiki/114560

Revision: 114560
Author:   catrope
Date:     2012-03-28 17:35:48 +0000 (Wed, 28 Mar 2012)
Log Message:
-----------
1.19wmf1: Merge https://gerrit.wikimedia.org/r/3755 and 
https://gerrit.wikimedia.org/r/3863

Modified Paths:
--------------
    branches/wmf/1.19wmf1/extensions/ClickTracking/ClickTracking.hooks.php
    branches/wmf/1.19wmf1/extensions/ClickTracking/ClickTracking.php

Modified: branches/wmf/1.19wmf1/extensions/ClickTracking/ClickTracking.hooks.php
===================================================================
--- branches/wmf/1.19wmf1/extensions/ClickTracking/ClickTracking.hooks.php      
2012-03-28 17:32:35 UTC (rev 114559)
+++ branches/wmf/1.19wmf1/extensions/ClickTracking/ClickTracking.hooks.php      
2012-03-28 17:35:48 UTC (rev 114560)
@@ -269,23 +269,32 @@
                return true;
        }
 
-       public static function articleSave( $editpage ) {
-               self::trackRequest( '-save-attempt' );
+       public static function attemptSave( $editpage ) {
+               self::trackRequest( '-save-attempt', 
"{$editpage->getArticle()->getTitle()}|{$editpage->getArticle()->getRevIdFetched()}"
 );
                return true;
        }
 
        public static function articleSaveComplete( $article, $user, $text, 
$summary, $minoredit,
                        $watchthis, $sectionanchor, $flags, $revision, 
$baseRevId ) {
-               self::trackRequest( '-save-complete' );
+               $revID = $revision instanceof Revision ? $revision->getID() : 0;
+               self::trackRequest( '-save-complete', 
"{$article->getTitle()}|$revID" );
                return true;
        }
 
-       protected static function trackRequest( $suffix ) {
+       protected static function trackRequest( $suffix, $extraInfo ) {
                global $wgRequest, $wgTitle;
 
                $session = $wgRequest->getVal( 'clicktrackingsession' );
                $event = $wgRequest->getVal( 'clicktrackingevent' );
                $info = $wgRequest->getVal( 'clicktrackinginfo' );
+               if ( $info != '' ) {
+                       if ( $extraInfo != '' ) {
+                               $info = "$info|$extraInfo";
+                       }
+               } else {
+                       $info = $extraInfo;
+               }
+
                if ( $session !== null && $event !== null ) {
                        $params = new FauxRequest( array(
                                'action' => 'clicktracking',

Modified: branches/wmf/1.19wmf1/extensions/ClickTracking/ClickTracking.php
===================================================================
--- branches/wmf/1.19wmf1/extensions/ClickTracking/ClickTracking.php    
2012-03-28 17:32:35 UTC (rev 114559)
+++ branches/wmf/1.19wmf1/extensions/ClickTracking/ClickTracking.php    
2012-03-28 17:35:48 UTC (rev 114560)
@@ -57,7 +57,7 @@
 $wgHooks['ParserTestTables'][] = 'ClickTrackingHooks::parserTestTables';
 
 $wgHooks['EditPage::showEditForm:fields'][] = 
'ClickTrackingHooks::editPageShowEditFormFields';
-$wgHooks['ArticleSave'][] = 'ClickTrackingHooks::articleSave';
+$wgHooks['EditPage::attemptSave'][] = 'ClickTrackingHooks::attemptSave';
 $wgHooks['ArticleSaveComplete'][] = 'ClickTrackingHooks::articleSaveComplete';
 
 // API modules


_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs