From: Roan Kattouw <catrope@users.mediawiki.org>
Date: Wed, 5 Oct 2011 10:16:49 +0000 (+0000)
Subject: (bug 31363) Expand description URLs for thumbnails to canonical form
X-Git-Tag: 1.31.0-rc.0~27262
X-Git-Url: http://git.cyclocoop.org/data/Fool?a=commitdiff_plain;h=a1d6bc1cb7a4cc83b225a9b9afb8ad268710038e;p=lhc%2Fweb%2Fwiklou.git

(bug 31363) Expand description URLs for thumbnails to canonical form
---

diff --git a/includes/filerepo/File.php b/includes/filerepo/File.php
index 30717f678c..630f1f8d18 100644
--- a/includes/filerepo/File.php
+++ b/includes/filerepo/File.php
@@ -735,7 +735,7 @@ abstract class File {
 			// Get the descriptionUrl to embed it as comment into the thumbnail. Bug 19791.
 			$descriptionUrl =  $this->getDescriptionUrl();
 			if ( $descriptionUrl ) {
-				$params['descriptionUrl'] = $wgServer . $descriptionUrl;
+				$params['descriptionUrl'] = wfExpandUrl( $descriptionUrl, PROTO_CANONICAL );
 			}
 
 			$script = $this->getTransformScript();