From: Brion Vibber <brion@users.mediawiki.org>
Date: Sat, 2 Jul 2005 02:17:48 +0000 (+0000)
Subject: * (bug 2661) Fix link generation in contribs
X-Git-Tag: 1.5.0beta2~87
X-Git-Url: http://git.cyclocoop.org/?a=commitdiff_plain;h=1595df6cb32c0bbfa7104d072d395765413a68fd;p=lhc%2Fweb%2Fwiklou.git

* (bug 2661) Fix link generation in contribs
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 94f254bcd7..e615075958 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -442,6 +442,7 @@ Various bugfixes, small features, and a few experimental things:
 * (bug 2656) Fix regression: prevent blocked users from reverting images
 * (bug 2629) Automatically capitalize usernames again instead of
   rejecting lowercase with a useless error message
+* (bug 2661) Fix link generation in contribs
 
 
 === Caveats ===
diff --git a/includes/SpecialContributions.php b/includes/SpecialContributions.php
index d94bed0d06..9eee43be43 100644
--- a/includes/SpecialContributions.php
+++ b/includes/SpecialContributions.php
@@ -34,6 +34,8 @@ class contribs_finder {
 		list($index, $usercond) = $this->get_user_cond();
 
 		$use_index = $this->dbr->useIndexClause($index);
+		extract($this->dbr->tableNames('page', 'revision'));
+		
 		#$sql =	"SELECT MIN(rev_timestamp) as earliest, MAX(rev_timestamp) as latest " .
 		#	"FROM page, revision $use_index WHERE page_id = rev_page " .
 		#	"AND ";
@@ -42,7 +44,7 @@ class contribs_finder {
 		#$sql .= $this->get_namespace_cond();
 		#$sql .= $this->get_minor_cond();
 		$sql =	"SELECT MIN(rev_timestamp) as earliest, MAX(rev_timestamp) as latest " .
-			"FROM revision $use_index WHERE " . $usercond;
+			"FROM $revision $use_index WHERE " . $usercond;
 
 		$res = $this->dbr->query($sql, "contribs_finder::get_edit_limits");
 		$rows = array();
@@ -92,8 +94,9 @@ class contribs_finder {
 	function get_previous_offset_for_paging() {
 		list($index, $usercond) = $this->get_user_cond();
 		$use_index = $this->dbr->useIndexClause($index);
+		extract($this->dbr->tableNames('page', 'revision'));
 
-		$sql =	"SELECT rev_timestamp FROM page, revision $use_index " .
+		$sql =	"SELECT rev_timestamp FROM $page, $revision $use_index " .
 			"WHERE page_id = rev_page AND rev_timestamp > '" . $this->offset . "' AND " .
 			"rev_user_text = " . $this->dbr->addQuotes($this->username);
 		$sql .= $this->get_namespace_cond();
@@ -110,8 +113,9 @@ class contribs_finder {
 	function get_first_offset_for_paging() {
 		list($index, $usercond) = $this->get_user_cond();
 		$use_index = $this->dbr->useIndexClause($index);
+		extract($this->dbr->tableNames('page', 'revision'));
 
-		$sql =	"SELECT rev_timestamp FROM page, revision $use_index " .
+		$sql =	"SELECT rev_timestamp FROM $page, $revision $use_index " .
 			"WHERE page_id = rev_page AND " .
 			"rev_user_text = " . $this->dbr->addQuotes($this->username);
 		$sql .= $this->get_namespace_cond();