Merge "Remove left-over use of wfMsg" into Wikidata

[lhc/web/wiklou.git] / includes / content / ContentHandler.php

diff --git a/includes/content/ContentHandler.php b/includes/content/ContentHandler.php
index 21ac488..91da3e8 100644 (file)
--- a/includes/content/ContentHandler.php
+++ b/includes/content/ContentHandler.php
@@ -329,8 +329,9 @@ abstract class ContentHandler {
        public static function getLocalizedName( $name ) {
                $key = "content-model-$name";
 
-               if ( wfEmptyMsg( $key ) ) return $name;
-               else return wfMsg( $key );
+               $msg = wfMessage( $key );
+
+               return $msg->exists() ? $msg->plain() : $name;
        }
 
        public static function getContentModels() {