http://www.mediawiki.org/wiki/Special:Code/MediaWiki/65295
Revision: 65295
Author: werdna
Date: 2010-04-20 10:26:01 +0000 (Tue, 20 Apr 2010)
Log Message:
-----------
Apply r65126
Modified Paths:
--------------
branches/wmf/1.16wmf4/extensions/NewUserMessage/NewUserMessage.class.php
Property Changed:
----------------
branches/wmf/1.16wmf4/extensions/NewUserMessage/NewUserMessage.class.php
Modified:
branches/wmf/1.16wmf4/extensions/NewUserMessage/NewUserMessage.class.php
===================================================================
--- branches/wmf/1.16wmf4/extensions/NewUserMessage/NewUserMessage.class.php
2010-04-20 10:20:06 UTC (rev 65294)
+++ branches/wmf/1.16wmf4/extensions/NewUserMessage/NewUserMessage.class.php
2010-04-20 10:26:01 UTC (rev 65295)
@@ -37,7 +37,19 @@
if ( !$editor->isLoggedIn() ) {
$editor->addToDatabase();
}
+
+ $signatures = wfMsgForContent(
'newusermessage-signatures' );
+ $signature = null;
+ if ( !wfEmptyMsg( 'newusermessage-signatures',
$signatures ) ) {
+ $pattern = '/^\* ?(.*?)$/m';
+ preg_match_all( $pattern, $signatures,
$signatureList, PREG_SET_ORDER );
+ if ( count( $signatureList ) > 0 ) {
+ $rand = rand( 0, count( $signatureList
) - 1 );
+ $signature = $signatureList[$rand][1];
+ }
+ }
+
// Add (any) content to
[[MediaWiki:Newusermessage-substitute]] to substitute the welcome template.
$substitute = wfMsgForContent(
'newusermessage-substitute' );
@@ -112,6 +124,7 @@
'summary' => $editSummary,
'root' => $threadArticle,
'subject' => $threadSubject,
+ 'signature' => $signature,
)
);
@@ -134,17 +147,9 @@
} else {
$text =
"{{{$templateTitleText}|$name|$realName}}";
}
-
- $signatures = wfMsgForContent(
'newusermessage-signatures' );
-
- if ( !wfEmptyMsg( 'newusermessage-signatures',
$signatures ) ) {
- $pattern = '/^\* ?(.*?)$/m';
- preg_match_all( $pattern, $signatures,
$signatureList, PREG_SET_ORDER );
- if ( count( $signatureList ) > 0 ) {
- $rand = rand( 0, count(
$signatureList ) - 1 );
- $signature =
$signatureList[$rand][1];
- $text .= "\n-- {$signature}
~~~~~";
- }
+
+ if ( $signature ) {
+ $text .= "\n-- {$signature} ~~~~~";
}
self::writeWelcomeMessage( $user, $article,
$text, $editSummary, $editor );
Property changes on:
branches/wmf/1.16wmf4/extensions/NewUserMessage/NewUserMessage.class.php
___________________________________________________________________
Added: svn:mergeinfo
+
/branches/wmf-deployment/extensions/NewUserMessage/NewUserMessage.class.php:60970
/trunk/extensions/NewUserMessage/NewUserMessage.class.php:65126
/trunk/phase3/extensions/NewUserMessage/NewUserMessage.class.php:63545-63546,63549,63643,63764,63897-63901
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
