Merge pull request #1993 from ned3y2k/fix/image-component-ssl

Fix/image component ssl
xpressengine · Jun 26, 2017 · dfa9c1e · dfa9c1e
2 parents d0c9931 + 77e8e73
commit dfa9c1e
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/modules/editor/components/image_link/image_link.class.php b/modules/editor/components/image_link/image_link.class.php
@@ -58,14 +58,22 @@ function transHTML($xml_obj)
 		$src = str_replace(array('&','"'), array('&amp;','&qout;'), $src);
 		$src = str_replace('&amp;amp;', '&amp;', $src);
 
+		$sslPort = Context::get('_https_port');
+		$sslPort = $sslPort != '443' ? ':'.$sslPort : '';
+
 		// Image containing the address to the address conversion request uri (rss output, etc. purposes)
 		$temp_src = explode('/', $src);
 		if(substr($src, 0,2)=='./') $src = Context::getRequestUri().substr($src, 2);
 		else if(substr($src , 0, 1)=='/')
 		{
-			if($_SERVER['HTTPS']=='on') $http_src = 'https://';
-			else $http_src = 'http://';
-			$src = $http_src.$_SERVER['HTTP_HOST'].$src;
+			if($_SERVER['HTTPS']=='on') {
+				$http_src = 'https://';
+				$src = $http_src.$_SERVER['HTTP_HOST'].$sslPort.$src;
+			} else {
+				$http_src = 'http://';
+				$src = $http_src.$_SERVER['HTTP_HOST'].$src;
+			}
+
 		}
 		else if(!strpos($temp_src[0],':') && $src) $src = Context::getRequestUri().$src;