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

Revision: 112271
Author:   catrope
Date:     2012-02-23 23:23:07 +0000 (Thu, 23 Feb 2012)
Log Message:
-----------
1.18wmf1: MFT r112267

Modified Paths:
--------------
    branches/wmf/1.18wmf1/extensions/CustomUserSignup/CustomUserSignup.hooks.php
    branches/wmf/1.18wmf1/extensions/CustomUserSignup/CustomUserSignup.php

Property Changed:
----------------
    branches/wmf/1.18wmf1/extensions/CustomUserSignup/


Property changes on: branches/wmf/1.18wmf1/extensions/CustomUserSignup
___________________________________________________________________
Added: svn:mergeinfo
   + /branches/REL1_15/phase3/extensions/CustomUserSignup:51646
/branches/REL1_17/phase3/extensions/CustomUserSignup:81445,81448
/branches/REL1_18/extensions/CustomUserSignup:101758,103190
/branches/new-installer/phase3/extensions/CustomUserSignup:43664-66004
/branches/sqlite/extensions/CustomUserSignup:58211-58321
/trunk/extensions/CustomUserSignup:95614,99592,99653,100092,100419,100516,100686,100692,100699,103260,103315,103378,103382,103669,104337,104736,104862-104863,104865,104971,105275,105902,105908,107043,107050,107337,107783,107816,107818,108701,108789,109532,109536,109542,112267
/trunk/phase3/extensions/CustomUserSignup:92580,92634,92713,92762,92765,92791,92854,92884,92886-92887,92894,92898,92907,92932,92958,93141,93149,93151,93233-93234,93258,93266,93303,93516-93518,93520,93818-93822,93847,93858,93891,93935-93936,94058,94062,94068,94107,94155,94235,94277,94346,94372,94422,94425,94444,94448,94456,94498,94517,94601,94630,94728,94738,94825,94862,94995-94997,95023,95042,95072-95073,95155,95327,95332,95410,95422,95426,95442,95468,95601,95812,98578,98598,98656

Modified: 
branches/wmf/1.18wmf1/extensions/CustomUserSignup/CustomUserSignup.hooks.php
===================================================================
--- 
branches/wmf/1.18wmf1/extensions/CustomUserSignup/CustomUserSignup.hooks.php    
    2012-02-23 23:21:11 UTC (rev 112270)
+++ 
branches/wmf/1.18wmf1/extensions/CustomUserSignup/CustomUserSignup.hooks.php    
    2012-02-23 23:23:07 UTC (rev 112271)
@@ -116,7 +116,7 @@
        }
 
        public static function addNewAccount( $user, $byEmail ){
-               global $wgRequest, $wgTitle;
+               global $wgRequest, $wgTitle, 
$wgCustomUserSignupTrackAccountCreations;
                $buckets = ClickTrackingHooks::unpackBucketInfo();
                if(isset($buckets['AccountCreation'])   && 
$buckets['AccountCreation'][0] != "none"){
                        
@@ -126,7 +126,7 @@
                                        time() + 60 * 60 * 24 * 365 , '/' );
                                        
                        $session = $wgRequest->getCookie( 
'clicktracking-session', "" );
-                       if ( $session !== null ) {
+                       if ( $session !== null && 
$wgCustomUserSignupTrackAccountCreations ) {
                                $params = new FauxRequest( array(
                                        'action' => 'clicktracking',
                                        'eventid' => 'account-created',

Modified: branches/wmf/1.18wmf1/extensions/CustomUserSignup/CustomUserSignup.php
===================================================================
--- branches/wmf/1.18wmf1/extensions/CustomUserSignup/CustomUserSignup.php      
2012-02-23 23:21:11 UTC (rev 112270)
+++ branches/wmf/1.18wmf1/extensions/CustomUserSignup/CustomUserSignup.php      
2012-02-23 23:23:07 UTC (rev 112271)
@@ -44,6 +44,8 @@
 
 $wgCustomUserSignupVersion = 1;
 $wgCustomUserSignupSetBuckets = true;
+// If true, log each account creation to ClickTracking
+$wgCustomUserSignupTrackAccountCreations = false;
 // For Account Creation Project
 ClickTrackingHooks::addCampaign($dir. 'modules', 'CustomUserSignup/modules', 
'AccountCreationUserBucket' );
 


_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

Reply via email to