Merge "Revert r47388 / 8d9243cf3: Use Title::getLocalURL() for rel=canonical links"

diff --git a/includes/page/Article.php b/includes/page/Article.php
index 450251a..053753e 100644 (file)
--- a/includes/page/Article.php
+++ b/includes/page/Article.php
@@ -1000,7 +1000,7 @@ class Article implements Page {
                                $outputPage->addModules( 'mediawiki.action.view.redirect' );
 
                                // Add a <link rel="canonical"> tag
-                               $outputPage->setCanonicalUrl( $this->getTitle()->getLocalURL() );
+                               $outputPage->setCanonicalUrl( $this->getTitle()->getCanonicalURL() );
 
                                // Tell the output object that the user arrived at this article through a redirect
                                $outputPage->setRedirectedFrom( $this->mRedirectedFrom );