tweak "remembermypassword" for consistency with "tog-rememberpassword" (follow-up...

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

diff --git a/includes/Pager.php b/includes/Pager.php
index a90867c..2d8be23 100644 (file)
--- a/includes/Pager.php
+++ b/includes/Pager.php
@@ -194,8 +194,12 @@ abstract class IndexPager implements Pager {
        function extractResultInfo( $offset, $limit, ResultWrapper $res ) {
                $numRows = $res->numRows();
                if ( $numRows ) {
+                       # Remove any table prefix from index field
+                       $parts = explode( '.', $this->mIndexField );
+                       $indexColumn = end( $parts );
+                       
                        $row = $res->fetchRow();
-                       $firstIndex = $row[$this->mIndexField];
+                       $firstIndex = $row[$indexColumn];
 
                        # Discard the extra result row if there is one
                        if ( $numRows > $this->mLimit && $numRows > 1 ) {
@@ -205,7 +209,7 @@ abstract class IndexPager implements Pager {
                                $this->mPastTheEndIndex = $this->mPastTheEndRow->$indexField;
                                $res->seek( $numRows - 2 );
                                $row = $res->fetchRow();
-                               $lastIndex = $row[$this->mIndexField];
+                               $lastIndex = $row[$indexColumn];
                        } else {
                                $this->mPastTheEndRow = null;
                                # Setting indexes to an empty string means that they will be
@@ -215,7 +219,7 @@ abstract class IndexPager implements Pager {
                                $this->mPastTheEndIndex = '';
                                $res->seek( $numRows - 1 );
                                $row = $res->fetchRow();
-                               $lastIndex = $row[$this->mIndexField];
+                               $lastIndex = $row[$indexColumn];
                        }
                } else {
                        $firstIndex = '';