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 82891fc..6a1c0e3 100644 (file)
--- 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;