https://www.mediawiki.org/wiki/Special:Code/MediaWiki/103449
Revision: 103449
Author: ialex
Date: 2011-11-17 10:06:56 +0000 (Thu, 17 Nov 2011)
Log Message:
-----------
* Removed Preferences::validateEmail() to that e-mail address modification is
in another special page, no callers
* Added $form parameter to Preferences::cleanSignature() and
Preferences::validateSignature(), they are passed to the functions since r102879
* Use local context to get messages
Modified Paths:
--------------
trunk/phase3/includes/Preferences.php
Modified: trunk/phase3/includes/Preferences.php
===================================================================
--- trunk/phase3/includes/Preferences.php 2011-11-17 09:20:51 UTC (rev
103448)
+++ trunk/phase3/includes/Preferences.php 2011-11-17 10:06:56 UTC (rev
103449)
@@ -1160,19 +1160,20 @@
}
/**
- * @param $signature
- * @param $alldata
+ * @param $signature string
+ * @param $alldata array
+ * @param $form HTMLForm
* @return bool|string
*/
- static function validateSignature( $signature, $alldata ) {
+ static function validateSignature( $signature, $alldata, $form ) {
global $wgParser, $wgMaxSigChars;
if ( mb_strlen( $signature ) > $wgMaxSigChars ) {
return Xml::element( 'span', array( 'class' => 'error'
),
- wfMessage( 'badsiglength' )->numParams(
$wgMaxSigChars )->text() );
+ $form->msg( 'badsiglength' )->numParams(
$wgMaxSigChars )->text() );
} elseif ( isset( $alldata['fancysig'] ) &&
$alldata['fancysig'] &&
false === $wgParser->validateSig( $signature )
) {
- return Xml::element( 'span', array( 'class' => 'error'
), wfMsg( 'badsig' ) );
+ return Xml::element( 'span', array( 'class' => 'error'
), $form->msg( 'badsig' )->text() );
} else {
return true;
}
@@ -1181,9 +1182,10 @@
/**
* @param $signature string
* @param $alldata array
+ * @param $form HTMLForm
* @return string
*/
- static function cleanSignature( $signature, $alldata ) {
+ static function cleanSignature( $signature, $alldata, $form ) {
global $wgParser;
if ( isset( $alldata['fancysig'] ) && $alldata['fancysig'] ) {
$signature = $wgParser->cleanSig( $signature );
@@ -1196,23 +1198,6 @@
}
/**
- * @param $email
- * @param $alldata
- * @return bool|String
- */
- static function validateEmail( $email, $alldata ) {
- if ( $email && !Sanitizer::validateEmail( $email ) ) {
- return wfMsgExt( 'invalidemailaddress', 'parseinline' );
- }
-
- global $wgEmailConfirmToEdit;
- if ( $wgEmailConfirmToEdit && !$email ) {
- return wfMsgExt( 'noemailtitle', 'parseinline' );
- }
- return true;
- }
-
- /**
* @param $user User
* @param $context IContextSource
* @param $formClass string
@@ -1229,7 +1214,7 @@
$htmlForm->setModifiedUser( $user );
$htmlForm->setId( 'mw-prefs-form' );
- $htmlForm->setSubmitText( wfMsg( 'saveprefs' ) );
+ $htmlForm->setSubmitText( $context->msg( 'saveprefs' )->text()
);
# Used message keys: 'accesskey-preferences-save',
'tooltip-preferences-save'
$htmlForm->setSubmitTooltip( 'preferences-save' );
$htmlForm->setSubmitID( 'prefsubmit' );
@@ -1532,7 +1517,7 @@
$t = SpecialPage::getTitleFor( 'Preferences', 'reset' );
- $html .= "\n" . Linker::link( $t, wfMsgHtml( 'restoreprefs' ) );
+ $html .= "\n" . Linker::link( $t, $this->msg( 'restoreprefs'
)->escaped() );
$html = Xml::tags( 'div', array( 'class' => 'mw-prefs-buttons'
), $html );
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
