[MediaWiki-commits] [Gerrit] Revert Getting rid of some globals - change (mediawiki...ConfirmEdit)
EBernhardson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201609
Change subject: Revert Getting rid of some globals
..
Revert Getting rid of some globals
This broke account creation for apps.
anomiebd808: Very likely $wgRequest !==
$loginForm-getContext()-getRequest() in
SimpleCaptcha::addNewAccountApiForm(), so when it
uses $wgRequest to check later on it doesn't see the parameter
renames made by that hook
function.
This reverts commit 23c6f2f04fe7616e057a3c7533e269f1800a84b3.
Change-Id: I793e7a987944d14c3be0eba4c4361793183a62b9
---
M Captcha.php
M ConfirmEditHooks.php
M FancyCaptcha.class.php
M QuestyCaptcha.class.php
4 files changed, 65 insertions(+), 81 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ConfirmEdit
refs/changes/09/201609/1
diff --git a/Captcha.php b/Captcha.php
index 825fc5a..68da0e6 100644
--- a/Captcha.php
+++ b/Captcha.php
@@ -100,7 +100,7 @@
$out = $context-getOutput();
if ( isset( $page-ConfirmEdit_ActivateCaptcha ) ||
$this-showEditCaptcha ||
- $this-shouldCheck( $page, '', '', $context, false )
+ $this-shouldCheck( $page, '', '', false )
) {
$out-addWikiText( $this-getMessage( $this-action ) );
$out-addHTML( $this-getForm() );
@@ -130,20 +130,16 @@
* @return bool true to keep running callbacks
*/
function injectEmailUser( $form ) {
- global $wgCaptchaTriggers;
-
- $user = $form-getUser();
- $out = $form-getOutput();
-
+ global $wgCaptchaTriggers, $wgOut, $wgUser;
if ( $wgCaptchaTriggers['sendemail'] ) {
$this-action = 'sendemail';
- if ( $user-isAllowed( 'skipcaptcha' ) ) {
+ if ( $wgUser-isAllowed( 'skipcaptcha' ) ) {
wfDebug( ConfirmEdit: user group allows
skipping captcha on email sending\n );
return true;
}
$form-addFooterText(
div class='captcha' .
- $out-parse( $this-getMessage( 'sendemail' ) )
.
+ $wgOut-parse( $this-getMessage( 'sendemail' )
) .
$this-getForm() .
/div\n );
}
@@ -157,19 +153,15 @@
* @return bool true to keep running callbacks
*/
function injectUserCreate( $template ) {
- global $wgCaptchaTriggers;
-
- $user = $template-getSkin()-getUser();
- $out = $template-getSkin()-getOutput();
-
+ global $wgCaptchaTriggers, $wgOut, $wgUser;
if ( $wgCaptchaTriggers['createaccount'] ) {
$this-action = 'usercreate';
- if ( $user-isAllowed( 'skipcaptcha' ) ) {
+ if ( $wgUser-isAllowed( 'skipcaptcha' ) ) {
wfDebug( ConfirmEdit: user group allows
skipping captcha on account creation\n );
return true;
}
$captcha = div class='captcha' .
- $out-parse( $this-getMessage( 'createaccount'
) ) .
+ $wgOut-parse( $this-getMessage(
'createaccount' ) ) .
$this-getForm() .
/div\n;
// for older MediaWiki versions
@@ -191,11 +183,11 @@
*/
function injectUserLogin( $template ) {
if ( $this-isBadLoginTriggered() ) {
- $out = $template-getSkin()-getOutput();
+ global $wgOut;
$this-action = 'badlogin';
$captcha = div class='captcha' .
- $out-parse( $this-getMessage( 'badlogin' ) ) .
+ $wgOut-parse( $this-getMessage( 'badlogin' )
) .
$this-getForm() .
/div\n;
// for older MediaWiki versions
@@ -219,7 +211,6 @@
*/
function triggerUserLogin( $user, $password, $retval ) {
global $wgCaptchaTriggers, $wgCaptchaBadLoginExpiration,
$wgMemc;
-
if ( $retval == LoginForm::WRONG_PASS
$wgCaptchaTriggers['badlogin'] ) {
$key = $this-badLoginKey();
$count = $wgMemc-get( $key );
@@ -308,17 +299,12 @@
* @param WikiPage $page
* @param $content Content|string
* @param $section string
-* @param
[MediaWiki-commits] [Gerrit] Revert Getting rid of some globals - change (mediawiki...ConfirmEdit)
jenkins-bot has submitted this change and it was merged.
Change subject: Revert Getting rid of some globals
..
Revert Getting rid of some globals
This broke account creation for apps.
anomiebd808: Very likely $wgRequest !==
$loginForm-getContext()-getRequest() in
SimpleCaptcha::addNewAccountApiForm(), so when it
uses $wgRequest to check later on it doesn't see the parameter
renames made by that hook
function.
This reverts commit 23c6f2f04fe7616e057a3c7533e269f1800a84b3.
Change-Id: I793e7a987944d14c3be0eba4c4361793183a62b9
---
M Captcha.php
M ConfirmEditHooks.php
M FancyCaptcha.class.php
M QuestyCaptcha.class.php
4 files changed, 62 insertions(+), 75 deletions(-)
Approvals:
EBernhardson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Captcha.php b/Captcha.php
index 0fd168d..5170914 100644
--- a/Captcha.php
+++ b/Captcha.php
@@ -103,7 +103,7 @@
$out = $context-getOutput();
if ( isset( $page-ConfirmEdit_ActivateCaptcha ) ||
$this-showEditCaptcha ||
- $this-shouldCheck( $page, '', '', $context, false )
+ $this-shouldCheck( $page, '', '', false )
) {
$out-addWikiText( $this-getMessage( $this-action ) );
$out-addHTML( $this-getForm() );
@@ -133,20 +133,16 @@
* @return bool true to keep running callbacks
*/
function injectEmailUser( $form ) {
- global $wgCaptchaTriggers;
-
- $user = $form-getUser();
- $out = $form-getOutput();
-
+ global $wgCaptchaTriggers, $wgOut, $wgUser;
if ( $wgCaptchaTriggers['sendemail'] ) {
$this-action = 'sendemail';
- if ( $user-isAllowed( 'skipcaptcha' ) ) {
+ if ( $wgUser-isAllowed( 'skipcaptcha' ) ) {
wfDebug( ConfirmEdit: user group allows
skipping captcha on email sending\n );
return true;
}
$form-addFooterText(
div class='captcha' .
- $out-parse( $this-getMessage( 'sendemail' ) )
.
+ $wgOut-parse( $this-getMessage( 'sendemail' )
) .
$this-getForm() .
/div\n );
}
@@ -160,19 +156,15 @@
* @return bool true to keep running callbacks
*/
function injectUserCreate( $template ) {
- global $wgCaptchaTriggers;
-
- $user = $template-getSkin()-getUser();
- $out = $template-getSkin()-getOutput();
-
+ global $wgCaptchaTriggers, $wgOut, $wgUser;
if ( $wgCaptchaTriggers['createaccount'] ) {
$this-action = 'usercreate';
- if ( $user-isAllowed( 'skipcaptcha' ) ) {
+ if ( $wgUser-isAllowed( 'skipcaptcha' ) ) {
wfDebug( ConfirmEdit: user group allows
skipping captcha on account creation\n );
return true;
}
$captcha = div class='captcha' .
- $out-parse( $this-getMessage( 'createaccount'
) ) .
+ $wgOut-parse( $this-getMessage(
'createaccount' ) ) .
$this-getForm() .
/div\n;
// for older MediaWiki versions
@@ -194,11 +186,11 @@
*/
function injectUserLogin( $template ) {
if ( $this-isBadLoginTriggered() ) {
- $out = $template-getSkin()-getOutput();
+ global $wgOut;
$this-action = 'badlogin';
$captcha = div class='captcha' .
- $out-parse( $this-getMessage( 'badlogin' ) ) .
+ $wgOut-parse( $this-getMessage( 'badlogin' )
) .
$this-getForm() .
/div\n;
// for older MediaWiki versions
@@ -222,7 +214,6 @@
*/
function triggerUserLogin( $user, $password, $retval ) {
global $wgCaptchaTriggers, $wgCaptchaBadLoginExpiration,
$wgMemc;
-
if ( $retval == LoginForm::WRONG_PASS
$wgCaptchaTriggers['badlogin'] ) {
$key = $this-badLoginKey();
$count = $wgMemc-get( $key );
@@ -311,18 +302,14 @@
* @param WikiPage $page
* @param $content Content|string
* @param $section string
-* @param $context IContextSource
* @param $isContent bool If true,
[MediaWiki-commits] [Gerrit] Revert Getting rid of some globals - change (mediawiki...ConfirmEdit)
EBernhardson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201622
Change subject: Revert Getting rid of some globals
..
Revert Getting rid of some globals
This broke account creation for apps.
anomiebd808: Very likely $wgRequest !==
$loginForm-getContext()-getRequest() in
SimpleCaptcha::addNewAccountApiForm(), so when it
uses $wgRequest to check later on it doesn't see the parameter
renames made by that hook
function.
This reverts commit 23c6f2f04fe7616e057a3c7533e269f1800a84b3.
Change-Id: I793e7a987944d14c3be0eba4c4361793183a62b9
(cherry picked from commit 804903b4a7cf3a829ae22fcc3c7b00f8aa851cb9)
---
M Captcha.php
M ConfirmEditHooks.php
M FancyCaptcha.class.php
M QuestyCaptcha.class.php
4 files changed, 62 insertions(+), 75 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ConfirmEdit
refs/changes/22/201622/1
diff --git a/Captcha.php b/Captcha.php
index 825fc5a..cd2971f 100644
--- a/Captcha.php
+++ b/Captcha.php
@@ -100,7 +100,7 @@
$out = $context-getOutput();
if ( isset( $page-ConfirmEdit_ActivateCaptcha ) ||
$this-showEditCaptcha ||
- $this-shouldCheck( $page, '', '', $context, false )
+ $this-shouldCheck( $page, '', '', false )
) {
$out-addWikiText( $this-getMessage( $this-action ) );
$out-addHTML( $this-getForm() );
@@ -130,20 +130,16 @@
* @return bool true to keep running callbacks
*/
function injectEmailUser( $form ) {
- global $wgCaptchaTriggers;
-
- $user = $form-getUser();
- $out = $form-getOutput();
-
+ global $wgCaptchaTriggers, $wgOut, $wgUser;
if ( $wgCaptchaTriggers['sendemail'] ) {
$this-action = 'sendemail';
- if ( $user-isAllowed( 'skipcaptcha' ) ) {
+ if ( $wgUser-isAllowed( 'skipcaptcha' ) ) {
wfDebug( ConfirmEdit: user group allows
skipping captcha on email sending\n );
return true;
}
$form-addFooterText(
div class='captcha' .
- $out-parse( $this-getMessage( 'sendemail' ) )
.
+ $wgOut-parse( $this-getMessage( 'sendemail' )
) .
$this-getForm() .
/div\n );
}
@@ -157,19 +153,15 @@
* @return bool true to keep running callbacks
*/
function injectUserCreate( $template ) {
- global $wgCaptchaTriggers;
-
- $user = $template-getSkin()-getUser();
- $out = $template-getSkin()-getOutput();
-
+ global $wgCaptchaTriggers, $wgOut, $wgUser;
if ( $wgCaptchaTriggers['createaccount'] ) {
$this-action = 'usercreate';
- if ( $user-isAllowed( 'skipcaptcha' ) ) {
+ if ( $wgUser-isAllowed( 'skipcaptcha' ) ) {
wfDebug( ConfirmEdit: user group allows
skipping captcha on account creation\n );
return true;
}
$captcha = div class='captcha' .
- $out-parse( $this-getMessage( 'createaccount'
) ) .
+ $wgOut-parse( $this-getMessage(
'createaccount' ) ) .
$this-getForm() .
/div\n;
// for older MediaWiki versions
@@ -191,11 +183,11 @@
*/
function injectUserLogin( $template ) {
if ( $this-isBadLoginTriggered() ) {
- $out = $template-getSkin()-getOutput();
+ global $wgOut;
$this-action = 'badlogin';
$captcha = div class='captcha' .
- $out-parse( $this-getMessage( 'badlogin' ) ) .
+ $wgOut-parse( $this-getMessage( 'badlogin' )
) .
$this-getForm() .
/div\n;
// for older MediaWiki versions
@@ -219,7 +211,6 @@
*/
function triggerUserLogin( $user, $password, $retval ) {
global $wgCaptchaTriggers, $wgCaptchaBadLoginExpiration,
$wgMemc;
-
if ( $retval == LoginForm::WRONG_PASS
$wgCaptchaTriggers['badlogin'] ) {
$key = $this-badLoginKey();
$count = $wgMemc-get( $key );
@@ -308,16 +299,12 @@
* @param WikiPage $page
* @param $content
[MediaWiki-commits] [Gerrit] Revert Getting rid of some globals - change (mediawiki...ConfirmEdit)
EBernhardson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201620
Change subject: Revert Getting rid of some globals
..
Revert Getting rid of some globals
This broke account creation for apps.
anomiebd808: Very likely $wgRequest !==
$loginForm-getContext()-getRequest() in
SimpleCaptcha::addNewAccountApiForm(), so when it
uses $wgRequest to check later on it doesn't see the parameter
renames made by that hook
function.
This reverts commit 23c6f2f04fe7616e057a3c7533e269f1800a84b3.
Change-Id: I793e7a987944d14c3be0eba4c4361793183a62b9
(cherry picked from commit 804903b4a7cf3a829ae22fcc3c7b00f8aa851cb9)
---
M Captcha.php
M ConfirmEditHooks.php
M FancyCaptcha.class.php
M QuestyCaptcha.class.php
4 files changed, 62 insertions(+), 75 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ConfirmEdit
refs/changes/20/201620/1
diff --git a/Captcha.php b/Captcha.php
index e928c3a..8c2d005 100644
--- a/Captcha.php
+++ b/Captcha.php
@@ -100,7 +100,7 @@
$out = $context-getOutput();
if ( isset( $page-ConfirmEdit_ActivateCaptcha ) ||
$this-showEditCaptcha ||
- $this-shouldCheck( $page, '', '', $context, false )
+ $this-shouldCheck( $page, '', '', false )
) {
$out-addWikiText( $this-getMessage( $this-action ) );
$out-addHTML( $this-getForm() );
@@ -130,20 +130,16 @@
* @return bool true to keep running callbacks
*/
function injectEmailUser( $form ) {
- global $wgCaptchaTriggers;
-
- $user = $form-getUser();
- $out = $form-getOutput();
-
+ global $wgCaptchaTriggers, $wgOut, $wgUser;
if ( $wgCaptchaTriggers['sendemail'] ) {
$this-action = 'sendemail';
- if ( $user-isAllowed( 'skipcaptcha' ) ) {
+ if ( $wgUser-isAllowed( 'skipcaptcha' ) ) {
wfDebug( ConfirmEdit: user group allows
skipping captcha on email sending\n );
return true;
}
$form-addFooterText(
div class='captcha' .
- $out-parse( $this-getMessage( 'sendemail' ) )
.
+ $wgOut-parse( $this-getMessage( 'sendemail' )
) .
$this-getForm() .
/div\n );
}
@@ -157,19 +153,15 @@
* @return bool true to keep running callbacks
*/
function injectUserCreate( $template ) {
- global $wgCaptchaTriggers;
-
- $user = $template-getSkin()-getUser();
- $out = $template-getSkin()-getOutput();
-
+ global $wgCaptchaTriggers, $wgOut, $wgUser;
if ( $wgCaptchaTriggers['createaccount'] ) {
$this-action = 'usercreate';
- if ( $user-isAllowed( 'skipcaptcha' ) ) {
+ if ( $wgUser-isAllowed( 'skipcaptcha' ) ) {
wfDebug( ConfirmEdit: user group allows
skipping captcha on account creation\n );
return true;
}
$captcha = div class='captcha' .
- $out-parse( $this-getMessage( 'createaccount'
) ) .
+ $wgOut-parse( $this-getMessage(
'createaccount' ) ) .
$this-getForm() .
/div\n;
// for older MediaWiki versions
@@ -191,11 +183,11 @@
*/
function injectUserLogin( $template ) {
if ( $this-isBadLoginTriggered() ) {
- $out = $template-getSkin()-getOutput();
+ global $wgOut;
$this-action = 'badlogin';
$captcha = div class='captcha' .
- $out-parse( $this-getMessage( 'badlogin' ) ) .
+ $wgOut-parse( $this-getMessage( 'badlogin' )
) .
$this-getForm() .
/div\n;
// for older MediaWiki versions
@@ -219,7 +211,6 @@
*/
function triggerUserLogin( $user, $password, $retval ) {
global $wgCaptchaTriggers, $wgCaptchaBadLoginExpiration,
$wgMemc;
-
if ( $retval == LoginForm::WRONG_PASS
$wgCaptchaTriggers['badlogin'] ) {
$key = $this-badLoginKey();
$count = $wgMemc-get( $key );
@@ -308,18 +299,14 @@
* @param WikiPage $page
* @param $content
[MediaWiki-commits] [Gerrit] Revert Getting rid of some globals - change (mediawiki...ConfirmEdit)
jenkins-bot has submitted this change and it was merged.
Change subject: Revert Getting rid of some globals
..
Revert Getting rid of some globals
This broke account creation for apps.
anomiebd808: Very likely $wgRequest !==
$loginForm-getContext()-getRequest() in
SimpleCaptcha::addNewAccountApiForm(), so when it
uses $wgRequest to check later on it doesn't see the parameter
renames made by that hook
function.
This reverts commit 23c6f2f04fe7616e057a3c7533e269f1800a84b3.
Change-Id: I793e7a987944d14c3be0eba4c4361793183a62b9
(cherry picked from commit 804903b4a7cf3a829ae22fcc3c7b00f8aa851cb9)
---
M Captcha.php
M ConfirmEditHooks.php
M FancyCaptcha.class.php
M QuestyCaptcha.class.php
4 files changed, 62 insertions(+), 75 deletions(-)
Approvals:
EBernhardson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Captcha.php b/Captcha.php
index e928c3a..8c2d005 100644
--- a/Captcha.php
+++ b/Captcha.php
@@ -100,7 +100,7 @@
$out = $context-getOutput();
if ( isset( $page-ConfirmEdit_ActivateCaptcha ) ||
$this-showEditCaptcha ||
- $this-shouldCheck( $page, '', '', $context, false )
+ $this-shouldCheck( $page, '', '', false )
) {
$out-addWikiText( $this-getMessage( $this-action ) );
$out-addHTML( $this-getForm() );
@@ -130,20 +130,16 @@
* @return bool true to keep running callbacks
*/
function injectEmailUser( $form ) {
- global $wgCaptchaTriggers;
-
- $user = $form-getUser();
- $out = $form-getOutput();
-
+ global $wgCaptchaTriggers, $wgOut, $wgUser;
if ( $wgCaptchaTriggers['sendemail'] ) {
$this-action = 'sendemail';
- if ( $user-isAllowed( 'skipcaptcha' ) ) {
+ if ( $wgUser-isAllowed( 'skipcaptcha' ) ) {
wfDebug( ConfirmEdit: user group allows
skipping captcha on email sending\n );
return true;
}
$form-addFooterText(
div class='captcha' .
- $out-parse( $this-getMessage( 'sendemail' ) )
.
+ $wgOut-parse( $this-getMessage( 'sendemail' )
) .
$this-getForm() .
/div\n );
}
@@ -157,19 +153,15 @@
* @return bool true to keep running callbacks
*/
function injectUserCreate( $template ) {
- global $wgCaptchaTriggers;
-
- $user = $template-getSkin()-getUser();
- $out = $template-getSkin()-getOutput();
-
+ global $wgCaptchaTriggers, $wgOut, $wgUser;
if ( $wgCaptchaTriggers['createaccount'] ) {
$this-action = 'usercreate';
- if ( $user-isAllowed( 'skipcaptcha' ) ) {
+ if ( $wgUser-isAllowed( 'skipcaptcha' ) ) {
wfDebug( ConfirmEdit: user group allows
skipping captcha on account creation\n );
return true;
}
$captcha = div class='captcha' .
- $out-parse( $this-getMessage( 'createaccount'
) ) .
+ $wgOut-parse( $this-getMessage(
'createaccount' ) ) .
$this-getForm() .
/div\n;
// for older MediaWiki versions
@@ -191,11 +183,11 @@
*/
function injectUserLogin( $template ) {
if ( $this-isBadLoginTriggered() ) {
- $out = $template-getSkin()-getOutput();
+ global $wgOut;
$this-action = 'badlogin';
$captcha = div class='captcha' .
- $out-parse( $this-getMessage( 'badlogin' ) ) .
+ $wgOut-parse( $this-getMessage( 'badlogin' )
) .
$this-getForm() .
/div\n;
// for older MediaWiki versions
@@ -219,7 +211,6 @@
*/
function triggerUserLogin( $user, $password, $retval ) {
global $wgCaptchaTriggers, $wgCaptchaBadLoginExpiration,
$wgMemc;
-
if ( $retval == LoginForm::WRONG_PASS
$wgCaptchaTriggers['badlogin'] ) {
$key = $this-badLoginKey();
$count = $wgMemc-get( $key );
@@ -308,18 +299,14 @@
* @param WikiPage $page
* @param $content Content|string
* @param $section string
-*
[MediaWiki-commits] [Gerrit] Revert Getting rid of some globals - change (mediawiki...ConfirmEdit)
jenkins-bot has submitted this change and it was merged.
Change subject: Revert Getting rid of some globals
..
Revert Getting rid of some globals
This broke account creation for apps.
anomiebd808: Very likely $wgRequest !==
$loginForm-getContext()-getRequest() in
SimpleCaptcha::addNewAccountApiForm(), so when it
uses $wgRequest to check later on it doesn't see the parameter
renames made by that hook
function.
This reverts commit 23c6f2f04fe7616e057a3c7533e269f1800a84b3.
Change-Id: I793e7a987944d14c3be0eba4c4361793183a62b9
(cherry picked from commit 804903b4a7cf3a829ae22fcc3c7b00f8aa851cb9)
---
M Captcha.php
M ConfirmEditHooks.php
M FancyCaptcha.class.php
M QuestyCaptcha.class.php
4 files changed, 62 insertions(+), 75 deletions(-)
Approvals:
EBernhardson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Captcha.php b/Captcha.php
index 825fc5a..cd2971f 100644
--- a/Captcha.php
+++ b/Captcha.php
@@ -100,7 +100,7 @@
$out = $context-getOutput();
if ( isset( $page-ConfirmEdit_ActivateCaptcha ) ||
$this-showEditCaptcha ||
- $this-shouldCheck( $page, '', '', $context, false )
+ $this-shouldCheck( $page, '', '', false )
) {
$out-addWikiText( $this-getMessage( $this-action ) );
$out-addHTML( $this-getForm() );
@@ -130,20 +130,16 @@
* @return bool true to keep running callbacks
*/
function injectEmailUser( $form ) {
- global $wgCaptchaTriggers;
-
- $user = $form-getUser();
- $out = $form-getOutput();
-
+ global $wgCaptchaTriggers, $wgOut, $wgUser;
if ( $wgCaptchaTriggers['sendemail'] ) {
$this-action = 'sendemail';
- if ( $user-isAllowed( 'skipcaptcha' ) ) {
+ if ( $wgUser-isAllowed( 'skipcaptcha' ) ) {
wfDebug( ConfirmEdit: user group allows
skipping captcha on email sending\n );
return true;
}
$form-addFooterText(
div class='captcha' .
- $out-parse( $this-getMessage( 'sendemail' ) )
.
+ $wgOut-parse( $this-getMessage( 'sendemail' )
) .
$this-getForm() .
/div\n );
}
@@ -157,19 +153,15 @@
* @return bool true to keep running callbacks
*/
function injectUserCreate( $template ) {
- global $wgCaptchaTriggers;
-
- $user = $template-getSkin()-getUser();
- $out = $template-getSkin()-getOutput();
-
+ global $wgCaptchaTriggers, $wgOut, $wgUser;
if ( $wgCaptchaTriggers['createaccount'] ) {
$this-action = 'usercreate';
- if ( $user-isAllowed( 'skipcaptcha' ) ) {
+ if ( $wgUser-isAllowed( 'skipcaptcha' ) ) {
wfDebug( ConfirmEdit: user group allows
skipping captcha on account creation\n );
return true;
}
$captcha = div class='captcha' .
- $out-parse( $this-getMessage( 'createaccount'
) ) .
+ $wgOut-parse( $this-getMessage(
'createaccount' ) ) .
$this-getForm() .
/div\n;
// for older MediaWiki versions
@@ -191,11 +183,11 @@
*/
function injectUserLogin( $template ) {
if ( $this-isBadLoginTriggered() ) {
- $out = $template-getSkin()-getOutput();
+ global $wgOut;
$this-action = 'badlogin';
$captcha = div class='captcha' .
- $out-parse( $this-getMessage( 'badlogin' ) ) .
+ $wgOut-parse( $this-getMessage( 'badlogin' )
) .
$this-getForm() .
/div\n;
// for older MediaWiki versions
@@ -219,7 +211,6 @@
*/
function triggerUserLogin( $user, $password, $retval ) {
global $wgCaptchaTriggers, $wgCaptchaBadLoginExpiration,
$wgMemc;
-
if ( $retval == LoginForm::WRONG_PASS
$wgCaptchaTriggers['badlogin'] ) {
$key = $this-badLoginKey();
$count = $wgMemc-get( $key );
@@ -308,16 +299,12 @@
* @param WikiPage $page
* @param $content Content|string
* @param $section string
-*
