* (bug 2394) Undo incompatible breakage to {{msg:}} compatiblity includes

This commit is contained in:
Brion Vibber 2005-06-12 13:39:28 +00:00
parent 9251fca0b1
commit fafdfd30ed
2 changed files with 6 additions and 10 deletions

View file

@ -279,6 +279,7 @@ Various bugfixes, small features, and a few experimental things:
* (bug 2384) Fix typo in regex for IP address checking
* (bug 650) Prominently link MySQL 4.1 help page in installer if a possible
version conflict is detected
* (bug 2394) Undo incompatible breakage to {{msg:}} compatiblity includes
=== Caveats ===

View file

@ -2083,9 +2083,13 @@ class Parser
$mwMsgnw =& MagicWord::get( MAG_MSGNW );
if ( $mwMsgnw->matchStartAndRemove( $part1 ) ) {
$nowiki = true;
} else {
# Remove obsolete MSG:
$mwMsg =& MagicWord::get( MAG_MSG );
$mwMsg->matchStartAndRemove( $part1 );
}
# int: is the wikitext equivalent of wfMsg()
# Check if it is an internal message
$mwInt =& MagicWord::get( MAG_INT );
if ( $mwInt->matchStartAndRemove( $part1 ) ) {
if ( $this->incrementIncludeCount( 'int:'.$part1 ) ) {
@ -2093,15 +2097,6 @@ class Parser
$found = true;
}
}
# msg: is the wikitext equivalent of wfMsgForContent()
$mwMsg =& MagicWord::get( MAG_MSG );
if ( $mwMsg->matchStartAndRemove( $part1 ) ) {
if ( $this->incrementIncludeCount( 'msg:'.$part1 ) ) {
$text = $linestart . wfMsgReal( $part1, $args, true, true );
$found = true;
}
}
}
# NS