From: Alexander Ebert <ebert@woltlab.com>
Date: Thu, 18 May 2017 12:31:51 +0000 (+0200)
Subject: Force https for page logo for secure pages
X-Git-Tag: 3.1.0_Alpha_1~457
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=71f9e4a4bbfc3a8087a49ab0a18b977afa316c0c;p=GitHub%2FWoltLab%2FWCF.git

Force https for page logo for secure pages

See #2273
---

diff --git a/wcfsetup/install/files/lib/data/style/ActiveStyle.class.php b/wcfsetup/install/files/lib/data/style/ActiveStyle.class.php
index 38903dfc48..77f61f33f3 100644
--- a/wcfsetup/install/files/lib/data/style/ActiveStyle.class.php
+++ b/wcfsetup/install/files/lib/data/style/ActiveStyle.class.php
@@ -1,6 +1,7 @@
 <?php
 namespace wcf\data\style;
 use wcf\data\DatabaseObjectDecorator;
+use wcf\system\request\RouteHandler;
 use wcf\system\WCF;
 
 /**
@@ -27,7 +28,12 @@ class ActiveStyle extends DatabaseObjectDecorator {
 	 * @return	string
 	 */
 	public function getImage($image) {
-		if (preg_match('~^https?://~', $image)) {
+		if (preg_match('~^(https?)://~', $image, $matches)) {
+			// rewrite protocol
+			if ($matches[1] === 'http' && RouteHandler::secureConnection()) {
+				return 'https' . mb_substr($image, 4);
+			}
+			
 			return $image;
 		}