Fix regression in use of messages with underscores/spaces; normalize spaces to unders...

diff --git a/includes/MessageCache.php b/includes/MessageCache.php
index 0e2b8f9..75c14d6 100644 (file)
--- a/includes/MessageCache.php
+++ b/includes/MessageCache.php
@@ -446,6 +446,7 @@ class MessageCache {
 
                # Normalise title-case input
                $lckey = $wgContLang->lcfirst( $key );
+               $lckey = str_replace( ' ', '_', $lckey );
 
                # Try the MediaWiki namespace
                if( !$this->mDisable && $useDB ) {

diff --git a/maintenance/parserTests.txt b/maintenance/parserTests.txt
index 730b038..3d748ae 100644 (file)
--- a/maintenance/parserTests.txt
+++ b/maintenance/parserTests.txt
@@ -4777,6 +4777,24 @@ Transclusion of nonexistent MediaWiki message
 </p>
 !! end
 
+!! test
+Transclusion of MediaWiki message with underscore
+!! input
+{{MediaWiki:history_short}}
+!! result
+<p>History
+</p>
+!! end
+
+!! test
+Transclusion of MediaWiki message with space
+!! input
+{{MediaWiki:history short}}
+!! result
+<p>History
+</p>
+!! end
+
 !! test
 Invalid header with following text
 !! input