All pastes #1955727 Raw Edit

staticpublisher on non-default p

public diff v1 · immutable
#1955727 ·published 2010-10-06 17:08 UTC
rendered paste body
diff -ru SilverStripe-v2.4.2/cms/code/staticpublisher/FilesystemPublisher.php /var/www/cms/code/staticpublisher/FilesystemPublisher.php--- SilverStripe-v2.4.2/cms/code/staticpublisher/FilesystemPublisher.php	2010-06-03 03:12:27.000000000 +0200+++ /var/www/cms/code/staticpublisher/FilesystemPublisher.php	2010-10-06 19:00:08.631773422 +0200@@ -110,7 +110,8 @@  			if (self::$domain_based_caching) { 				if (!$urlParts) continue; // seriously malformed url here...-				$filename = $urlParts['host'] . '/' . $filename;+				$port = isset($urlParts['port']) ? ':'.$urlParts['port'] : '';+				$filename = $urlParts['host'] . $port . '/' . $filename; 			} 		 			$mappedUrls[$url] = ((dirname($filename) == '/') ? '' :  (dirname($filename).'/')).basename($filename);@@ -320,4 +321,4 @@ 	 } -?>\ Kein Zeilenumbruch am Dateiende.+?>diff -ru SilverStripe-v2.4.2/sapphire/core/control/Director.php /var/www/sapphire/core/control/Director.php--- SilverStripe-v2.4.2/sapphire/core/control/Director.php	2010-08-19 00:38:51.000000000 +0200+++ /var/www/sapphire/core/control/Director.php	2010-10-06 19:01:41.990769910 +0200@@ -200,7 +200,8 @@ 		// Handle absolute URLs 		if (@parse_url($url, PHP_URL_HOST) != '') { 			$bits = parse_url($url);-			$_SERVER['HTTP_HOST'] = $bits['host'];+			$port = isset($bits['port']) ? ':'.$bits['port'] : '';+			$_SERVER['HTTP_HOST'] = $bits['host'].$port; 			$url = Director::makeRelative($url); 		}