From: Brion Vibber <brion@users.mediawiki.org>
Date: Sat, 14 Jan 2006 04:35:43 +0000 (+0000)
Subject: Revert Domas's last checkin, it broke tabs on redirects. Please test before checkin!
X-Git-Tag: 1.6.0~557
X-Git-Url: http://git.cyclocoop.org/%40spipnet%40?a=commitdiff_plain;h=aa127daa2de6b1588ad9b29fc3a609aa83c9e0a0;p=lhc%2Fweb%2Fwiklou.git

Revert Domas's last checkin, it broke tabs on redirects. Please test before checkin!
---

diff --git a/includes/Article.php b/includes/Article.php
index 82891fc7bc..6a1c0e3132 100644
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -91,8 +91,11 @@ class Article {
 					} else {
 						return $rt->getFullURL();
 					}
-				} 
-				return $rt;
+				} elseif( $rt->exists() ) {
+					// Internal redirects can be handled relatively gracefully.
+					// We may have to change to another Article subclass, though.
+					return $rt;
+				}
 			}
 		}
 		
@@ -424,7 +427,6 @@ class Article {
 	 * @access private
 	 */
 	function loadPageData( $data ) {
-		$this->mTitle->mArticleID = $data->page_id;
 		$this->mTitle->loadRestrictions( $data->page_restrictions );
 		$this->mTitle->mRestrictionsLoaded = true;