Make site_url secure if on SSL page and site_url scheme is not http.

headstash · headstash · commit 87b92987085b · 2012-07-09T13:15:58.000-05:00
diff --git a/lib/WordPressHTTPS/Module/Filters.php b/lib/WordPressHTTPS/Module/Filters.php
@@ -90,7 +90,7 @@ public function admin_url( $url, $path, $blog_id ) {
 	 * @return string $url
 	 */
 	public function site_url( $url, $path, $scheme, $blog_id ) {
-		if ( $scheme == 'https' ) {
+		if ( $scheme == 'https' || ( $scheme != 'http' && $this->getPlugin()->isSsl() ) ) {
 			$url = $this->getPlugin()->makeUrlHttps($url);
 		}
 		return $url;

Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ public function admin_url( $url, $path, $blog_id ) {`
`90`	`90`	`* @return string $url`
`91`	`91`	`*/`
`92`	`92`	`public function site_url( $url, $path, $scheme, $blog_id ) {`
`93`		`- if ( $scheme == 'https' ) {`
	`93`	`+ if ( $scheme == 'https' \|\| ( $scheme != 'http' && $this->getPlugin()->isSsl() ) ) {`
`94`	`94`	`$url = $this->getPlugin()->makeUrlHttps($url);`
`95`	`95`	`}`
`96`	`96`	`return $url;`