Changeset 32384 for branches/4.2/src/wp-includes/post.php

Timestamp:

05/06/2015 04:20:54 PM (10 years ago)

Author:

boonebgorges

Message:

Attachment URLs should only be forced to SSL on the front end.

Detecting SSL status on the Dashboard introduces problems when writing content
that is saved to the database and then displayed on the front end, where SSL
may be optional (or impossible, due to self-signed certificates). The new
approach parallels the logic in get_home_url() for forcing HTTPS.

See [31614] #15928 for background.

Fixes #32112 for 4.2 branch.

Location:

branches/4.2

Files:

• . (modified) (1 prop)
• src/wp-includes/post.php (modified) (1 diff)

branches/4.2/src/wp-includes/post.php

@@ -4993 +4993 @@
     }
 
-    /*
-     * If currently on SSL, prefer HTTPS URLs when we know they're supported by the domain
-     * (which is to say, when they share the domain name of the current SSL page).
-     */
-    if ( is_ssl() && 'https' !== substr( $url, 0, 5 ) && parse_url( $url, PHP_URL_HOST ) === $_SERVER['HTTP_HOST'] ) {
-        $url = set_url_scheme( $url, 'https' );
+    // On SSL front-end, URLs should be HTTPS.
+    if ( is_ssl() && ! is_admin() && 'wp-login.php' !== $GLOBALS['pagenow'] ) {
+        $url = set_url_scheme( $url );
     }