From: Roan Kattouw <catrope@users.mediawiki.org>
Date: Mon, 5 Sep 2011 10:55:54 +0000 (+0000)
Subject: Followup r96180: remove unused global $wgCanonicalServer
X-Git-Tag: 1.31.0-rc.0~27903
X-Git-Url: http://git.cyclocoop.org/%24href?a=commitdiff_plain;h=9d59856a951a1c328e00bd9cf0ec43ea67cc4a2f;p=lhc%2Fweb%2Fwiklou.git

Followup r96180: remove unused global $wgCanonicalServer
---

diff --git a/includes/Title.php b/includes/Title.php
index 8d1119c112..4e21f510fe 100644
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -1044,7 +1044,6 @@ class Title {
 	 * @return string The URL
 	 */
 	public function getCanonicalURL( $query = '', $variant = false ) {
-		global $wgCanonicalServer;
 		$url = wfExpandUrl( $this->getLocalURL( $query, $variant ) . $this->getFragmentForURL(), PROTO_CANONICAL );
 		wfRunHooks( 'GetCanonicalURL', array( &$this, &$url, $query, $variant ) );
 		return $url;