From b12efddf30315f1dc1f45a9fc7d1462ce74883c9 Mon Sep 17 00:00:00 2001 From: Kunal Mehta Date: Mon, 6 Jul 2015 03:08:03 -0700 Subject: [PATCH] Use PROTO_CANONICAL for icon links in emails We should not be using HTTP links for HTTPS-only sites. Bug: T104835 Change-Id: I7dadeb29a8c5562c48d5beb2dd33818152c9eb63 --- includes/EmailFormatter.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/includes/EmailFormatter.php b/includes/EmailFormatter.php index 8fdb07096..45b6a4320 100644 --- a/includes/EmailFormatter.php +++ b/includes/EmailFormatter.php @@ -192,8 +192,7 @@ abstract class EchoEmailMode { $iconUrl = "$wgExtensionAssetsPath/$path"; } - // Use http for image path, there is no need for https - return wfExpandUrl( $iconUrl, PROTO_HTTP ); + return wfExpandUrl( $iconUrl, PROTO_CANONICAL ); } /**