http://www.mediawiki.org/wiki/Special:Code/MediaWiki/86037
Revision: 86037
Author: ashley
Date: 2011-04-14 09:52:02 +0000 (Thu, 14 Apr 2011)
Log Message:
-----------
CustomUserSignup: swap $_GET to $wgRequest
Modified Paths:
--------------
trunk/extensions/CustomUserSignup/CustomUserSignup.hooks.php
trunk/extensions/CustomUserSignup/CustomUserTemplate.php
Modified: trunk/extensions/CustomUserSignup/CustomUserSignup.hooks.php
===================================================================
--- trunk/extensions/CustomUserSignup/CustomUserSignup.hooks.php
2011-04-14 09:47:46 UTC (rev 86036)
+++ trunk/extensions/CustomUserSignup/CustomUserSignup.hooks.php
2011-04-14 09:52:02 UTC (rev 86037)
@@ -9,8 +9,9 @@
class CustomUserSignupHooks {
public static function userCreateForm( &$template ) {
- if( isset( $_GET['campaign'] ) ) {
- $campaign = $_GET['campaign'];
+ global $wgRequest;
+ if( isset( $wgRequest->getVal( 'campaign' ) ) ) {
+ $campaign = $wgRequest->getVal( 'campaign' );
$newTemplate;
if( get_class( $template ) == 'UserloginTemplate' ) {
$newTemplate = new CustomUserloginTemplate();
@@ -43,8 +44,9 @@
}
public static function welcomeScreen( &$welcomeCreationMsg,
&$injected_html ) {
- if( isset( $_GET['campaign'] ) ) {
- $campaign = $_GET['campaign'];
+ global $wgRequest;
+ if( isset( $wgRequest->getVal( 'campaign' ) ) ) {
+ $campaign = $wgRequest->getVal( 'campaign' );
if( wfMsg(
"customusertemplate-$campaign-welcomecreation" ) !=
"<customusertemplate-$campaign-welcomecreation>" ) {
$welcomeCreationMsg =
"customusertemplate-$campaign-welcomecreation";
Modified: trunk/extensions/CustomUserSignup/CustomUserTemplate.php
===================================================================
--- trunk/extensions/CustomUserSignup/CustomUserTemplate.php 2011-04-14
09:47:46 UTC (rev 86036)
+++ trunk/extensions/CustomUserSignup/CustomUserTemplate.php 2011-04-14
09:52:02 UTC (rev 86037)
@@ -5,9 +5,10 @@
protected $campaign = null;
function __construct() {
+ global $wgRequest;
parent::__construct();
- if( isset( $_GET['campaign'] ) ) {
- preg_match( '/[A-Za-z0-9]+/', $_GET['campaign'],
$matches );
+ if( isset( $wgRequest->getVal( 'campaign' ) ) ) {
+ preg_match( '/[A-Za-z0-9]+/', $wgRequest->getVal(
'campaign' ), $matches );
$this->campaign = $matches[0];
}
}
@@ -45,9 +46,10 @@
protected $campaign = null;
function __construct() {
+ global $wgRequest;
parent::__construct();
- if( isset( $_GET['campaign'] ) ) {
- preg_match( '/[A-Za-z0-9]+/', $_GET['campaign'],
$matches );
+ if( isset( $wgRequest->getVal( 'campaign' ) ) ) {
+ preg_match( '/[A-Za-z0-9]+/', $wgRequest->getVal(
'campaign' ), $matches );
$this->campaign = $matches[0];
}
}
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
