http://www.mediawiki.org/wiki/Special:Code/MediaWiki/67333
Revision: 67333 Author: catrope Date: 2010-06-04 09:54:23 +0000 (Fri, 04 Jun 2010) Log Message: ----------- 1.16wmf4: MFT r67332 Modified Paths: -------------- branches/wmf/1.16wmf4/extensions/ContactPage/SpecialContact.php Property Changed: ---------------- branches/wmf/1.16wmf4/extensions/ContactPage/ Property changes on: branches/wmf/1.16wmf4/extensions/ContactPage ___________________________________________________________________ Modified: svn:mergeinfo - /branches/wmf-deployment/extensions/ContactPage:60970 /trunk/extensions/ContactPage:62820-67074 /trunk/phase3/extensions/ContactPage:63545-63546,63549,63643,63764,63897-63901,64113,64509,65387,65391,65555,65590,65650,65816 + /branches/wmf-deployment/extensions/ContactPage:60970 /trunk/extensions/ContactPage:62820-67074,67332 /trunk/phase3/extensions/ContactPage:63545-63546,63549,63643,63764,63897-63901,64113,64509,65387,65391,65555,65590,65650,65816 Modified: branches/wmf/1.16wmf4/extensions/ContactPage/SpecialContact.php =================================================================== --- branches/wmf/1.16wmf4/extensions/ContactPage/SpecialContact.php 2010-06-04 09:52:05 UTC (rev 67332) +++ branches/wmf/1.16wmf4/extensions/ContactPage/SpecialContact.php 2010-06-04 09:54:23 UTC (rev 67333) @@ -230,11 +230,11 @@ Xml::textarea( 'wpText', $this->text, 80, 20, array( 'id' => 'wpText' ) ) . '</td> </tr>'; - if ( $wgContactIncludeIP ) { + if ( $wgContactIncludeIP && $wgUser->isLoggedIn() ) { $form .= '<tr> <td></td> <td class="mw-input">' . - Xml::checkLabel( wfMsg( 'contactpage-includeip' ), 'wpIncludeIP', 'wpIncludeIP', $wgUser->isAnon() ) . + Xml::checkLabel( wfMsg( 'contactpage-includeip' ), 'wpIncludeIP', 'wpIncludeIP', false ) . '</td> </tr>'; } @@ -300,7 +300,7 @@ } function doSubmit() { - global $wgOut; + global $wgOut, $wgUser; global $wgEnableEmail, $wgUserEmailUseReplyTo, $wgEmergencyContact; global $wgContactUser, $wgContactSender, $wgContactSenderName, $wgContactIncludeIP; @@ -329,7 +329,7 @@ $subject = wfMsgForContent( 'contactpage-defsubject' ); } - $includeIP = $wgContactIncludeIP && $this->includeIP; + $includeIP = $wgContactIncludeIP && ( $this->includeIP || $wgUser->isAnon() ); if ( $this->fromname !== '' ) { if ( $includeIP ) { $subject = wfMsgForContent( 'contactpage-subject-and-sender-withip', $subject, $this->fromname, $senderIP ); _______________________________________________ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs