Ticket #25449: 25449.diff

wp-includes/functions.php

@@ -1876 +1876 @@
                         $url = trailingslashit( $siteurl ) . 'files';
                 }
         }
+        
+        // On SSL front-end, URLs should be HTTPS
+        if ( is_ssl() && ! is_admin() && 'wp-login.php' !== $GLOBALS['pagenow'] ) {
+                $url = set_url_scheme( $url );
+        }       
 
         $basedir = $dir;
         $baseurl = $url;

wp-includes/post.php

@@ -4895 +4895 @@
                 $url = get_the_guid( $post->ID );
         }
 
-        // On SSL front-end, URLs should be HTTPS.
-        if ( is_ssl() && ! is_admin() && 'wp-login.php' !== $GLOBALS['pagenow'] ) {
-                $url = set_url_scheme( $url );
-        }
-
         /**
          * Filter the attachment URL.
          *