From: Roan Kattouw <catrope@users.mediawiki.org>
Date: Fri, 20 Feb 2009 20:49:47 +0000 (+0000)
Subject: (bug 17538) Use local URLs in <link>s
X-Git-Tag: 1.31.0-rc.0~42754
X-Git-Url: https://git.cyclocoop.org/%242?a=commitdiff_plain;h=ee408f078973335cbe5931a5c05529c31818be4a;p=lhc%2Fweb%2Fwiklou.git

(bug 17538) Use local URLs in <link>s
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index c22e4fc91e..51b49f5bd8 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -206,6 +206,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 17581) Wrong index name in PostgreSQL's updater: was rc_timestamp_nobot,
   changed to rc_timestamp_bot
 * (bug 17437) Fixed incorrect link to web-based installer
+* (bug 17538) Use shorter URLs in <link> elements
 
 == API changes in 1.15 ==
 * (bug 16858) Revamped list=deletedrevs to make listing deleted contributions
diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 3862e3f516..a05fdbeeb8 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -938,13 +938,13 @@ class OutputPage {
 					'rel' => 'alternate',
 					'type' => 'application/x-wiki',
 					'title' => wfMsg( 'edit' ),
-					'href' => $wgTitle->getFullURL( 'action=edit' )
+					'href' => $wgTitle->getLocalURL( 'action=edit' )
 				) );
 				// Alternate edit link
 				$this->addLink( array(
 					'rel' => 'edit',
 					'title' => wfMsg( 'edit' ),
-					'href' => $wgTitle->getFullURL( 'action=edit' )
+					'href' => $wgTitle->getLocalURL( 'action=edit' )
 				) );
 			}
 		}
@@ -1597,7 +1597,7 @@ class OutputPage {
 				foreach( $wgFeedClasses as $format => $class ) {
 					$tags[] = $this->feedLink(
 						$format,
-						$rctitle->getFullURL( "feed={$format}" ),
+						$rctitle->getLocalURL( "feed={$format}" ),
 						wfMsg( "site-{$format}-feed", $wgSitename ) ); # For grep: 'site-rss-feed', 'site-atom-feed'.
 				}
 			}