forcemerge 612267 612227 tag 612267 + patch thanks > Some sources on the net say, that this extension does not work in Mediawiki > 1.15 and PHP 5.3.
While we will probably want to upload a new version of this package with a newer ConfirmEdit, this bug affects stable, and so I propose this minimal patch to fix it. SR -- Stefano Rivera http://tumbleweed.org.za/ H: +27 21 465 6908 C: +27 72 419 8559 UCT: x3127
Description: PHP 5.3 compatibility fixes for ConfirmEdit. Origin: http://www.mediawiki.org/wiki/Special:Code/MediaWiki/53461 http://www.mediawiki.org/wiki/Special:Code/MediaWiki/55449 Bug-Debian: http://bugs.debian.org/612267 Bug-Wikimedia: https://bugzilla.wikimedia.org/show_bug.cgi?id=20383 Last-Update: 2011-02-14 --- a/dist/mediawiki-extensions-confirmedit/usr/share/mediawiki-extensions/confirmedit/ConfirmEdit_body.php +++ b/dist/mediawiki-extensions-confirmedit/usr/share/mediawiki-extensions/confirmedit/ConfirmEdit_body.php @@ -15,15 +15,15 @@ return $wgCaptcha; } - static function confirmEdit( &$editPage, $newtext, $section ) { + static function confirmEdit( $editPage, $newtext, $section ) { return self::getInstance()->confirmEdit( $editPage, $newtext, $section ); } - static function confirmEditMerged( &$editPage, $newtext ) { + static function confirmEditMerged( $editPage, $newtext ) { return self::getInstance()->confirmEditMerged( $editPage, $newtext ); } - static function confirmEditAPI( &$editPage, $newtext, &$resultArr ) { + static function confirmEditAPI( $editPage, $newtext, &$resultArr ) { return self::getInstance()->confirmEditAPI( $editPage, $newtext, $resultArr ); } @@ -458,7 +458,7 @@ * Backend function for confirmEdit() and confirmEditAPI() * @return bool false if the CAPTCHA is rejected, true otherwise */ - private function doConfirmEdit( &$editPage, $newtext, $section, $merged = false ) { + private function doConfirmEdit( $editPage, $newtext, $section, $merged = false ) { if( $this->shouldCheck( $editPage, $newtext, $section, $merged ) ) { if( $this->passCaptcha() ) { return true; @@ -479,7 +479,7 @@ * @param bool $merged * @return bool true to continue saving, false to abort and show a captcha form */ - function confirmEdit( &$editPage, $newtext, $section, $merged = false ) { + function confirmEdit( $editPage, $newtext, $section, $merged = false ) { if( defined('MW_API') ) { # API mode # The CAPTCHA was already checked and approved @@ -497,12 +497,12 @@ * @param EditPage $editPage * @param string $newtext */ - function confirmEditMerged( &$editPage, $newtext ) { + function confirmEditMerged( $editPage, $newtext ) { return $this->confirmEdit( $editPage, $newtext, false, true ); } - function confirmEditAPI( &$editPage, $newtext, &$resultArr) { + function confirmEditAPI( $editPage, $newtext, &$resultArr) { if( !$this->doConfirmEdit( $editPage, $newtext, false, false ) ) { $this->addCaptchaAPI($resultArr); return false;
