Partial revert of r37502, 37503: double-quoting of SQL strings

[lhc/web/wiklou.git] / includes / Pager.php

diff --git a/includes/Pager.php b/includes/Pager.php
index a63b97f..62c4e55 100644 (file)
--- a/includes/Pager.php
+++ b/includes/Pager.php
@@ -1,8 +1,14 @@
 <?php
+/**
+ * @defgroup Pager Pager
+ *
+ * @file
+ * @ingroup Pager
+ */
 
 /**
  * Basic pager interface.
- * @addtogroup Pager
+ * @ingroup Pager
  */
 interface Pager {
        function getNavigationBar();
@@ -49,7 +55,7 @@ interface Pager {
  *  getQueryInfo() and getIndexField(). Don't forget to call the parent
  *  constructor if you override it.
  *
- * @addtogroup Pager
+ * @ingroup Pager
  */
 abstract class IndexPager implements Pager {
        public $mRequest;
@@ -477,13 +483,9 @@ abstract class IndexPager implements Pager {
 
 /**
  * IndexPager with an alphabetic list and a formatted navigation bar
- * @addtogroup Pager
+ * @ingroup Pager
  */
 abstract class AlphabeticPager extends IndexPager {
-       function __construct() {
-               parent::__construct();
-       }
-
        /**
         * Shamelessly stolen bits from ReverseChronologicalPager,
         * didn't want to do class magic as may be still revamped
@@ -495,11 +497,12 @@ abstract class AlphabeticPager extends IndexPager {
                        return $this->mNavigationBar;
                }
 
+               $opts = array( 'parsemag', 'escapenoentities' );
                $linkTexts = array(
-                       'prev' => wfMsgHtml( 'prevn', $wgLang->formatNum( $this->mLimit ) ),
-                       'next' => wfMsgHtml( 'nextn', $wgLang->formatNum($this->mLimit ) ),
-                       'first' => wfMsgHtml( 'page_first' ),
-                       'last' => wfMsgHtml( 'page_last' )
+                       'prev' => wfMsgExt( 'prevn', $opts, $wgLang->formatNum( $this->mLimit ) ),
+                       'next' => wfMsgExt( 'nextn', $opts, $wgLang->formatNum($this->mLimit ) ),
+                       'first' => wfMsgExt( 'page_first', $opts ),
+                       'last' => wfMsgExt( 'page_last', $opts )
                );
 
                $pagingLinks = $this->getPagingLinks( $linkTexts );
@@ -557,7 +560,7 @@ abstract class AlphabeticPager extends IndexPager {
 
 /**
  * IndexPager with a formatted navigation bar
- * @addtogroup Pager
+ * @ingroup Pager
  */
 abstract class ReverseChronologicalPager extends IndexPager {
        public $mDefaultDirection = true;
@@ -592,7 +595,7 @@ abstract class ReverseChronologicalPager extends IndexPager {
 
 /**
  * Table-based display with a user-selectable sort order
- * @addtogroup Pager
+ * @ingroup Pager
  */
 abstract class TablePager extends IndexPager {
        var $mSort;