diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-07-18 19:12:44 -0600 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-07-18 19:12:44 -0600 |
| commit | 4bb2aeca1d198391ca856aa16c40b8559c68daec (patch) | |
| tree | 72371f0fd947bcec45562ccfa1164f3349e4e4e6 /extensions | |
| parent | fa93eabd8fdebb47d623537afbd5e6df1271112a (diff) | |
| parent | cacc939b34e315b85e2d72997811eb6677996cc1 (diff) | |
Merge branch 'archwiki'
Conflicts:
extensions/ArchInterWiki.sql
extensions/FluxBBAuthPlugin.php
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/FunnyQuestion/FunnyQuestion.body.php | 4 | ||||
| -rw-r--r-- | extensions/FunnyQuestion/FunnyQuestion.php | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/extensions/FunnyQuestion/FunnyQuestion.body.php b/extensions/FunnyQuestion/FunnyQuestion.body.php index ae0a25ab..449914fd 100644 --- a/extensions/FunnyQuestion/FunnyQuestion.body.php +++ b/extensions/FunnyQuestion/FunnyQuestion.body.php @@ -97,7 +97,7 @@ class FunnyQuestion { return true; } - public static function checkFunnyQuestionOnEditPage($editpage, $text, $section, $error) { + public static function checkFunnyQuestionOnEditPage($editor, $text, $section, &$error, $summary) { global $wgUser; if (!$wgUser->isLoggedIn() && !self::checkFunnyQuestion()) { @@ -116,7 +116,7 @@ class FunnyQuestion { return true; } - public static function checkFunnyQuestionOnAbortNewAccount($user, $message) { + public static function checkFunnyQuestionOnAbortNewAccount($user, &$message) { if (!self::checkFunnyQuestion()) { $message = wfMsg('wrong-answer'); return false; diff --git a/extensions/FunnyQuestion/FunnyQuestion.php b/extensions/FunnyQuestion/FunnyQuestion.php index 8db54617..578955a9 100644 --- a/extensions/FunnyQuestion/FunnyQuestion.php +++ b/extensions/FunnyQuestion/FunnyQuestion.php @@ -2,7 +2,7 @@ $wgExtensionCredits['other'][] = array( 'name' => 'FunnyQuestion', - 'version' => '2.2', + 'version' => '2.3', 'description' => 'Challenge-response authentication', 'author' => 'Pierre Schmitz', 'url' => 'https://pierre-schmitz.com/' |