Fix mistake in r80248 and restructure a bit

diff --git a/includes/LogPage.php b/includes/LogPage.php
index 8c47665..54595a2 100644 (file)
--- a/includes/LogPage.php
+++ b/includes/LogPage.php
@@ -514,11 +514,15 @@ class LogPage {
        public static function formatBlockFlag( $flag, $forContent = false ) {
                static $messages = array();
                if( !isset( $messages[$flag] ) ) {
+                       $messages[$flag] = htmlspecialchars( $flag ); // Fallback
+
                        $msg = wfMessage( 'block-log-flags-' . $flag );
                        if ( $forContent ) {
-                               $msg = $msg->inContentLanguage();
+                               $msg->inContentLanguage();
+                       }
+                       if ( $msg->exists() ) {
+                               $messages[$flag] = $msg->escaped();
                        }
-                       $messages[$flag] = htmlspecialchars( !$msg->exists() ? $flag : $msg );
                }
                return $messages[$flag];
        }