Changeset 8242 for branches/crazyhorse/wp-includes/link-template.php

Timestamp:

07/02/2008 11:07:56 PM (17 years ago)

Author:

mdawaffe

Message:

crazyhorse: merge with log:trunk@8151:8240

File:

• branches/crazyhorse/wp-includes/link-template.php (modified) (1 diff)

branches/crazyhorse/wp-includes/link-template.php

@@ -782 +782 @@
     // should the list of allowed schemes be maintained elsewhere?
     if ( !in_array($scheme, array('http', 'https')) ) {
-        if ( ('login' == $scheme) && ( force_ssl_login() || force_ssl_admin() ) )
+        if ( ('login_post' == $scheme) && ( force_ssl_login() || force_ssl_admin() ) )
+            $scheme = 'https';
+        elseif ( ('login' == $scheme) && ( force_ssl_admin() ) )
             $scheme = 'https';
         elseif ( ('admin' == $scheme) && force_ssl_admin() )