From: Aaron Schulz <aaron@users.mediawiki.org>
Date: Sat, 10 May 2008 13:38:07 +0000 (+0000)
Subject: Pass in $join_conds
X-Git-Tag: 1.31.0-rc.0~47738
X-Git-Url: http://git.cyclocoop.org/data/%24oldEdit?a=commitdiff_plain;h=228f097d954469673634ea47c08ccc9adddca7dd;p=lhc%2Fweb%2Fwiklou.git

Pass in $join_conds
---

diff --git a/includes/Pager.php b/includes/Pager.php
index 9606860e3c..a63b97f398 100644
--- a/includes/Pager.php
+++ b/includes/Pager.php
@@ -215,6 +215,7 @@ abstract class IndexPager implements Pager {
 		$fields = $info['fields'];
 		$conds = isset( $info['conds'] ) ? $info['conds'] : array();
 		$options = isset( $info['options'] ) ? $info['options'] : array();
+		$join_conds = isset( $info['join_conds'] ) ? $info['join_conds'] : array();
 		if ( $descending ) {
 			$options['ORDER BY'] = $this->mIndexField;
 			$operator = '>';
@@ -226,7 +227,7 @@ abstract class IndexPager implements Pager {
 			$conds[] = $this->mIndexField . $operator . $this->mDb->addQuotes( $offset );
 		}
 		$options['LIMIT'] = intval( $limit );
-		$res = $this->mDb->select( $tables, $fields, $conds, $fname, $options );
+		$res = $this->mDb->select( $tables, $fields, $conds, $fname, $options, $join_conds );
 		return new ResultWrapper( $this->mDb, $res );
 	}