Move the circular reference check to *after* redirect resolution, to avoid infinite...

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

diff --git a/includes/Pager.php b/includes/Pager.php
index c4d55b6..1078a74 100644 (file)
--- a/includes/Pager.php
+++ b/includes/Pager.php
@@ -154,6 +154,26 @@ abstract class IndexPager implements Pager {
 
                wfProfileOut( $fname );
        }
+       
+       /**
+        * Return the result wrapper.
+        */
+       function getResult() {
+               return $this->mResult;
+       }
+       
+       /**
+        * Set the offset from an other source than $wgRequest
+        */
+       function setOffset( $offset ) {
+               $this->mOffset = $offset;
+       }
+       /**
+        * Set the limit from an other source than $wgRequest
+        */
+       function setLimit( $limit ) {
+               $this->mLimit = $limit;
+       }
 
        /**
         * Extract some useful data from the result object for use by
@@ -284,17 +304,18 @@ abstract class IndexPager implements Pager {
                if ( $query === null ) {
                        return $text;
                }
-               if( $type == 'prev' || $type == 'next' ) {
-                       $attrs = "rel=\"$type\"";
-               } elseif( $type == 'first' ) {
-                       $attrs = "rel=\"start\"";
-               } else {
-                       # HTML 4 has no rel="end" . . .
-                       $attrs = '';
+
+               $attrs = array();
+               if( in_array( $type, array( 'first', 'prev', 'next', 'last' ) ) ) {
+                       # HTML5 rel attributes
+                       $attrs['rel'] = $type;
+               }
+
+               if( $type ) {
+                       $attrs['class'] = "mw-{$type}link";
                }
-               return $this->getSkin()->makeKnownLinkObj( $this->getTitle(), $text,
-                               wfArrayToCGI( $query, $this->getDefaultQuery() ), '', '',
-                               $attrs );
+               return $this->getSkin()->link( $this->getTitle(), $text,
+                       $attrs, $query + $this->getDefaultQuery(), array('noclasses','known') );
        }
 
        /**
@@ -352,6 +373,8 @@ abstract class IndexPager implements Pager {
                        unset( $this->mDefaultQuery['offset'] );
                        unset( $this->mDefaultQuery['limit'] );
                        unset( $this->mDefaultQuery['order'] );
+                       unset( $this->mDefaultQuery['month'] );
+                       unset( $this->mDefaultQuery['year'] );
                }
                return $this->mDefaultQuery;
        }
@@ -425,7 +448,7 @@ abstract class IndexPager implements Pager {
                }
                foreach ( $this->mLimitsShown as $limit ) {
                        $links[] = $this->makeLink( $wgLang->formatNum( $limit ),
-                               array( 'offset' => $offset, 'limit' => $limit ) );
+                               array( 'offset' => $offset, 'limit' => $limit ), 'num' );
                }
                return $links;
        }
@@ -445,6 +468,7 @@ abstract class IndexPager implements Pager {
         *    fields => Field(s) for passing to Database::select(), may be *
         *    conds => WHERE conditions
         *    options => option array
+        *    join_conds => JOIN conditions
         */
        abstract function getQueryInfo();
 
@@ -507,10 +531,10 @@ abstract class AlphabeticPager extends IndexPager {
 
                $pagingLinks = $this->getPagingLinks( $linkTexts );
                $limitLinks = $this->getLimitLinks();
-               $limits = implode( ' | ', $limitLinks );
+               $limits = $wgLang->pipeList( $limitLinks );
 
                $this->mNavigationBar =
-                       "({$pagingLinks['first']} | {$pagingLinks['last']}) " .
+                       "(" . $wgLang->pipeList( array( $pagingLinks['first'], $pagingLinks['last'] ) ) . ") " .
                        wfMsgHtml( 'viewprevnext', $pagingLinks['prev'],
                        $pagingLinks['next'], $limits );
 
@@ -526,7 +550,7 @@ abstract class AlphabeticPager extends IndexPager {
                        if( $first ) {
                                $first = false;
                        } else {
-                               $extra .= ' | ';
+                               $extra .= wfMsgExt( 'pipe-separator' , 'escapenoentities' );
                        }
 
                        if( $order == $this->mOrderType ) {
@@ -587,9 +611,9 @@ abstract class ReverseChronologicalPager extends IndexPager {
 
                $pagingLinks = $this->getPagingLinks( $linkTexts );
                $limitLinks = $this->getLimitLinks();
-               $limits = implode( ' | ', $limitLinks );
+               $limits = $wgLang->pipeList( $limitLinks );
 
-               $this->mNavigationBar = "({$pagingLinks['first']} | {$pagingLinks['last']}) " .
+               $this->mNavigationBar = "({$pagingLinks['first']}" . wfMsgExt( 'pipe-separator' , 'escapenoentities' ) . "{$pagingLinks['last']}) " .
                        wfMsgHtml("viewprevnext", $pagingLinks['prev'], $pagingLinks['next'], $limits);
                return $this->mNavigationBar;
        }
@@ -722,7 +746,8 @@ abstract class TablePager extends IndexPager {
        }
 
        function formatRow( $row ) {
-               $s = "<tr>\n";
+               $rowClass = htmlspecialchars( $this->getRowClass( $row ) );
+               $s = "<tr class=\"$rowClass\">\n";
                $fieldNames = $this->getFieldNames();
                $this->mCurrentRow = $row;  # In case formatValue needs to know
                foreach ( $fieldNames as $field => $name ) {
@@ -738,6 +763,14 @@ abstract class TablePager extends IndexPager {
                return $s;
        }
 
+       /**
+        * Get a class name to be applied to the given row.
+        * @param object $row The database result row
+        */
+       function getRowClass($row) {
+               return '';
+       }
+
        function getIndexField() {
                return $this->mSort;
        }
@@ -844,7 +877,7 @@ abstract class TablePager extends IndexPager {
                        "<form method=\"get\" action=\"$url\">" .
                        wfMsgHtml( 'table_pager_limit', $this->getLimitSelect() ) .
                        "\n<input type=\"submit\" value=\"$msgSubmit\"/>\n" .
-                       $this->getHiddenFields( 'limit' ) .
+                       $this->getHiddenFields( array('limit','title') ) .
                        "</form>\n";
        }