Merge "Clarify documentation of apihelp-query+categorymembers-paramvalue-prop-type"

[lhc/web/wiklou.git] / includes / specials / SpecialAllMessages.php

diff --git a/includes/specials/SpecialAllMessages.php b/includes/specials/SpecialAllMessages.php
index e5c5aa4..5b74c8b 100644 (file)
--- a/includes/specials/SpecialAllMessages.php
+++ b/includes/specials/SpecialAllMessages.php
@@ -206,7 +206,7 @@ class AllMessagesTablePager extends TablePager {
                        Xml::label( $this->msg( 'table_pager_limit_label' )->text(), 'mw-table_pager_limit_label' ) .
                        '</td>
                        <td class="mw-input">' .
-                       $this->getLimitSelect() .
+                       $this->getLimitSelect( array( 'id' => 'mw-table_pager_limit_label' ) ) .
                        '</td>
                        <tr>
                                <td></td>
@@ -399,7 +399,7 @@ class AllMessagesTablePager extends TablePager {
 
                        case 'am_default' :
                        case 'am_actual' :
-                               return Sanitizer::escapeHtmlAllowEntities( $value, ENT_QUOTES );
+                               return Sanitizer::escapeHtmlAllowEntities( $value );
                }
 
                return '';
@@ -445,7 +445,11 @@ class AllMessagesTablePager extends TablePager {
                } elseif ( $field === 'am_title' ) {
                        return array( 'class' => $field );
                } else {
-                       return array( 'lang' => wfBCP47( $this->langcode ), 'dir' => $this->lang->getDir(), 'class' => $field );
+                       return array(
+                               'lang' => $this->lang->getHtmlCode(),
+                               'dir' => $this->lang->getDir(),
+                               'class' => $field
+                       );
                }
        }