r68502 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r68501‎ | r68502 | r68503 >
Date:03:10, 24 June 2010
Author:tstarling
Status:deferred
Tags:
Comment:
MFT r53461: fix reference/value conflict in PHP 5.2, it affects 1.15 as much as 1.16.
Modified paths:
  • /branches/REL1_15/extensions/ConfirmEdit/ConfirmEdit_body.php (modified) (history)

Diff [purge]

Index: branches/REL1_15/extensions/ConfirmEdit/ConfirmEdit_body.php
@@ -15,11 +15,11 @@
1616 return $wgCaptcha;
1717 }
1818
19 - static function confirmEdit( &$editPage, $newtext, $section ) {
 19+ static function confirmEdit( $editPage, $newtext, $section ) {
2020 return self::getInstance()->confirmEdit( $editPage, $newtext, $section );
2121 }
2222
23 - static function confirmEditMerged( &$editPage, $newtext ) {
 23+ static function confirmEditMerged( $editPage, $newtext ) {
2424 return self::getInstance()->confirmEditMerged( $editPage, $newtext );
2525 }
2626
@@ -458,7 +458,7 @@
459459 * Backend function for confirmEdit() and confirmEditAPI()
460460 * @return bool false if the CAPTCHA is rejected, true otherwise
461461 */
462 - private function doConfirmEdit( &$editPage, $newtext, $section, $merged = false ) {
 462+ private function doConfirmEdit( $editPage, $newtext, $section, $merged = false ) {
463463 if( $this->shouldCheck( $editPage, $newtext, $section, $merged ) ) {
464464 if( $this->passCaptcha() ) {
465465 return true;
@@ -479,7 +479,7 @@
480480 * @param bool $merged
481481 * @return bool true to continue saving, false to abort and show a captcha form
482482 */
483 - function confirmEdit( &$editPage, $newtext, $section, $merged = false ) {
 483+ function confirmEdit( $editPage, $newtext, $section, $merged = false ) {
484484 if( defined('MW_API') ) {
485485 # API mode
486486 # The CAPTCHA was already checked and approved
@@ -497,7 +497,7 @@
498498 * @param EditPage $editPage
499499 * @param string $newtext
500500 */
501 - function confirmEditMerged( &$editPage, $newtext ) {
 501+ function confirmEditMerged( $editPage, $newtext ) {
502502 return $this->confirmEdit( $editPage, $newtext, false, true );
503503 }
504504
Property changes on: branches/REL1_15/extensions/ConfirmEdit/ConfirmEdit_body.php
___________________________________________________________________
Name: svn:mergeinfo
505505 + /trunk/extensions/ConfirmEdit/ConfirmEdit_body.php:50133,50219,53461

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r53461The EditPage object is not passed by reference in the EditFilter hooksmrzman21:47, 18 July 2009

Status & tagging log