| Index: trunk/extensions/ConfirmEdit/Captcha.php |
| — | — | @@ -645,11 +645,7 @@ |
| 646 | 646 | */ |
| 647 | 647 | private function doConfirmEdit( $editPage, $newtext, $section, $merged = false ) { |
| 648 | 648 | if ( $this->shouldCheck( $editPage, $newtext, $section, $merged ) ) { |
| 649 | | - if ( $this->passCaptcha() ) { |
| 650 | | - return true; |
| 651 | | - } else { |
| 652 | | - return false; |
| 653 | | - } |
| | 649 | + return $this->passCaptcha(); |
| 654 | 650 | } else { |
| 655 | 651 | wfDebug( "ConfirmEdit: no need to show captcha.\n" ); |
| 656 | 652 | return true; |
| — | — | @@ -686,7 +682,6 @@ |
| 687 | 683 | return $this->confirmEdit( $editPage, $newtext, false, true ); |
| 688 | 684 | } |
| 689 | 685 | |
| 690 | | - |
| 691 | 686 | function confirmEditAPI( $editPage, $newtext, &$resultArr ) { |
| 692 | 687 | if ( !$this->doConfirmEdit( $editPage, $newtext, false, false ) ) { |
| 693 | 688 | $this->addCaptchaAPI( $resultArr ); |
| Index: trunk/extensions/ConfirmEdit/ConfirmEdit.php |
| — | — | @@ -185,11 +185,7 @@ |
| 186 | 186 | $wgExtensionMessagesFiles['ConfirmEdit'] = "$wgConfirmEditIP/ConfirmEdit.i18n.php"; |
| 187 | 187 | $wgExtensionAliasesFiles['ConfirmEdit'] = "$wgConfirmEditIP/ConfirmEdit.alias.php"; |
| 188 | 188 | |
| 189 | | -if ( defined( 'MW_SUPPORTS_EDITFILTERMERGED' ) ) { |
| 190 | | - $wgHooks['EditFilterMerged'][] = 'ConfirmEditHooks::confirmEditMerged'; |
| 191 | | -} else { |
| 192 | | - $wgHooks['EditFilter'][] = 'ConfirmEditHooks::confirmEdit'; |
| 193 | | -} |
| | 189 | +$wgHooks['EditFilterMerged'][] = 'ConfirmEditHooks::confirmEditMerged'; |
| 194 | 190 | $wgHooks['UserCreateForm'][] = 'ConfirmEditHooks::injectUserCreate'; |
| 195 | 191 | $wgHooks['AbortNewAccount'][] = 'ConfirmEditHooks::confirmUserCreate'; |
| 196 | 192 | $wgHooks['LoginAuthenticateAudit'][] = 'ConfirmEditHooks::triggerUserLogin'; |
| Index: trunk/extensions/ConfirmEdit/ConfirmEditHooks.php |
| — | — | @@ -17,10 +17,6 @@ |
| 18 | 18 | return $wgCaptcha; |
| 19 | 19 | } |
| 20 | 20 | |
| 21 | | - static function confirmEdit( $editPage, $newtext, $section ) { |
| 22 | | - return self::getInstance()->confirmEdit( $editPage, $newtext, $section ); |
| 23 | | - } |
| 24 | | - |
| 25 | 21 | static function confirmEditMerged( $editPage, $newtext ) { |
| 26 | 22 | return self::getInstance()->confirmEditMerged( $editPage, $newtext ); |
| 27 | 23 | } |