UltrasonicNXT has submitted this change and it was merged.
Change subject: Fix errors with Captcha
......................................................................
Fix errors with Captcha
Apparently you need to pass an OutputPage to getForm
Change-Id: I64e76b707fcd9a3f7068311aaa73053940c2c63b
---
M WikiForum.php
M WikiForumClass.php
M WikiForumGui.php
3 files changed, 4 insertions(+), 4 deletions(-)
Approvals:
UltrasonicNXT: Verified; Looks good to me, approved
diff --git a/WikiForum.php b/WikiForum.php
index 1a8522c..5c9f793 100644
--- a/WikiForum.php
+++ b/WikiForum.php
@@ -35,7 +35,7 @@
'path' => __FILE__,
'name' => 'WikiForum',
'author' => array( 'Michael Chlebek', 'Jack Phoenix', 'Adam Carter
(UltrasonicNXT)' ),
- 'version' => '2.2.1',
+ 'version' => '2.2.2',
'url' => 'https://www.mediawiki.org/wiki/Extension:WikiForum',
'descriptionmsg' => 'wikiforum-desc'
);
diff --git a/WikiForumClass.php b/WikiForumClass.php
index d6d60b9..6910793 100644
--- a/WikiForumClass.php
+++ b/WikiForumClass.php
@@ -348,14 +348,14 @@
*
* @return string
*/
- public static function getCaptcha() {
+ public static function getCaptcha( $out ) {
wfSetupSession(); // NOTE: make sure we have a session. May be
required for CAPTCHAs to work.
$output = wfMessage( "captcha-sendemail" )->parseAsBlock();
$captcha = ConfirmEditHooks::getInstance();
$captcha->trigger = 'wikiforum';
$captcha->action = 'post';
- $output .= $captcha->getForm();
+ $output .= $captcha->getForm( $out );
return $output;
}
diff --git a/WikiForumGui.php b/WikiForumGui.php
index 4d5dd96..a85f936 100644
--- a/WikiForumGui.php
+++ b/WikiForumGui.php
@@ -252,7 +252,7 @@
<td><textarea name="text"
id="wpTextbox1" style="height: ' . $height . ';">' . $text_prev .
'</textarea></td>
</tr>';
if ( WikiForumClass::useCaptcha() ) {
- $output .= '<tr><td>' .
WikiForumClass::getCaptcha() . '</td></tr>';
+ $output .= '<tr><td>' .
WikiForumClass::getCaptcha( $wgOut ) . '</td></tr>';
}
$output .= '<tr>
<td>
--
To view, visit https://gerrit.wikimedia.org/r/263186
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I64e76b707fcd9a3f7068311aaa73053940c2c63b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikiForum
Gerrit-Branch: master
Gerrit-Owner: UltrasonicNXT <[email protected]>
Gerrit-Reviewer: UltrasonicNXT <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
