--- wordpress-https-2.0-dev.php	2011-09-10 17:52:25.000000000 -0700
+++ wordpress-https.php	2011-09-11 01:16:39.000000000 -0700
@@ -503,8 +502,8 @@
 		 */
 		public function process($buffer) {
 			if ( $this->is_ssl() ) {
-				// Fix any occurrence of the HTTPS version of the regular domain when using different SSL Host
-				if ( $this->diff_host ) {
+				// Fix any occurrence of the HTTPS version of the regular domain when using different SSL Host or a non-standard port
+				if ( $this->diff_host || $this->ssl_port ) {
 					$regex_url = preg_quote($this->replace_http($this->http_url));
 					// Escape forward slashes
 					$regex_url = str_replace('/', '\/', $regex_url);
@@ -515,7 +514,7 @@
 					for ($i = 0; $i<=sizeof($matches[0]); $i++) {
 						$html = $matches[0][$i];
 						$url = $matches[1][$i];
-						$buffer = str_replace($html, str_replace($url, $this->replace_https_url($url), $html), $buffer);
+						$buffer = str_replace($html, str_replace($url, $this->replace_http_url($url), $html), $buffer);
 					}
 				}