Update force-https.php

jessuppi · web-flow · commit a369ddf5b0df · 2025-02-01T05:28:41.000+07:00
diff --git a/force-https.php b/force-https.php
@@ -61,12 +61,15 @@ function force_https_securize_url( $value ) {
     }
 
     // enforce https for valid urls
-    if ( strpos( $value, 'http://' ) === 0 ) {
-        return set_url_scheme( $value, 'https' );
+    $secure_value = set_url_scheme( $value, 'https' );
+
+    // return if url scheme was changed (valid URL handled)
+    if ( $secure_value !== $value ) {
+        return $secure_value;
     }
 
-    // replace http with https in text or html content
-    return str_replace( 'http://', 'https://', $value );
+    // replace http with https in text or html content only if needed
+    return ( strpos( $value, 'http://' ) !== false ) ? str_replace( 'http://', 'https://', $value ) : $value;
 }
 
 // apply https to all relevant wordpress filters  

Original file line number	Diff line number	Diff line change
`@@ -61,12 +61,15 @@ function force_https_securize_url( $value ) {`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`// enforce https for valid urls`
`64`		`- if ( strpos( $value, 'http://' ) === 0 ) {`
`65`		`- return set_url_scheme( $value, 'https' );`
	`64`	`+ $secure_value = set_url_scheme( $value, 'https' );`
	`65`	`+`
	`66`	`+ // return if url scheme was changed (valid URL handled)`
	`67`	`+ if ( $secure_value !== $value ) {`
	`68`	`+ return $secure_value;`
`66`	`69`	`}`
`67`	`70`
`68`		`- // replace http with https in text or html content`
`69`		`- return str_replace( 'http://', 'https://', $value );`
	`71`	`+ // replace http with https in text or html content only if needed`
	`72`	`+ return ( strpos( $value, 'http://' ) !== false ) ? str_replace( 'http://', 'https://', $value ) : $value;`
`70`	`73`	`}`
`71`	`74`
`72`	`75`	`// apply https to all relevant wordpress filters`