https://www.mediawiki.org/wiki/Special:Code/MediaWiki/112270
Revision: 112270
Author: catrope
Date: 2012-02-23 23:21:11 +0000 (Thu, 23 Feb 2012)
Log Message:
-----------
1.19wmf1: MFT r112267
Modified Paths:
--------------
branches/wmf/1.19wmf1/extensions/CustomUserSignup/CustomUserSignup.hooks.php
branches/wmf/1.19wmf1/extensions/CustomUserSignup/CustomUserSignup.php
Property Changed:
----------------
branches/wmf/1.19wmf1/extensions/CustomUserSignup/
Property changes on: branches/wmf/1.19wmf1/extensions/CustomUserSignup
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/JSTesting/extensions/CustomUserSignup:100352-107913
/branches/REL1_15/phase3/extensions/CustomUserSignup:51646
/branches/REL1_17/phase3/extensions/CustomUserSignup:81445,81448
/branches/new-installer/phase3/extensions/CustomUserSignup:43664-66004
/branches/sqlite/extensions/CustomUserSignup:58211-58321
/branches/wmf/1.18wmf1/extensions/CustomUserSignup:97508
/trunk/extensions/CustomUserSignup:111043,111199,111218,111484,111575,111604,111659-111661,111668,111670,111688,111690,111698,111713,111715,111780,111796,111814,111947,112074,112153,112160,112166,112267
/trunk/phase3/extensions/CustomUserSignup:111002,111029,111034,111062,111067,111076,111085,111128,111144,111251
Modified:
branches/wmf/1.19wmf1/extensions/CustomUserSignup/CustomUserSignup.hooks.php
===================================================================
---
branches/wmf/1.19wmf1/extensions/CustomUserSignup/CustomUserSignup.hooks.php
2012-02-23 23:20:47 UTC (rev 112269)
+++
branches/wmf/1.19wmf1/extensions/CustomUserSignup/CustomUserSignup.hooks.php
2012-02-23 23:21:11 UTC (rev 112270)
@@ -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.19wmf1/extensions/CustomUserSignup/CustomUserSignup.php
===================================================================
--- branches/wmf/1.19wmf1/extensions/CustomUserSignup/CustomUserSignup.php
2012-02-23 23:20:47 UTC (rev 112269)
+++ branches/wmf/1.19wmf1/extensions/CustomUserSignup/CustomUserSignup.php
2012-02-23 23:21:11 UTC (rev 112270)
@@ -44,6 +44,8 @@
$wgCustomUserSignupVersion = 1;
$wgCustomUserSignupSetBuckets = true;
+// If true, log each account creation to ClickTracking
+$wgCustomUserSignupTrackAccountCreations = false;
// For Account Creation Project
if ( class_exists( 'ClickTrackingHooks' ) ) {
ClickTrackingHooks::addCampaign($dir. 'modules',
'CustomUserSignup/modules', 'AccountCreationUserBucket' );
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
