diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2008-07-02 13:44:49 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2008-07-02 13:44:49 +0000 |
| commit | 6d572cbe19ffedb5b92d8528798c5683154bb185 (patch) | |
| tree | 4cc943e8f399addf1a10c03386342110bcc9d584 /wp-includes/link-template.php | |
| parent | 034c1b3b665fa28816dfc6157d610c6d25fd54fe (diff) | |
| download | wordpress-mu-6d572cbe19ffedb5b92d8528798c5683154bb185.tar.gz wordpress-mu-6d572cbe19ffedb5b92d8528798c5683154bb185.tar.xz wordpress-mu-6d572cbe19ffedb5b92d8528798c5683154bb185.zip | |
WP Merge to rev 8216
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1344 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-includes/link-template.php')
| -rw-r--r-- | wp-includes/link-template.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/wp-includes/link-template.php b/wp-includes/link-template.php index 9875356..1a07d72 100644 --- a/wp-includes/link-template.php +++ b/wp-includes/link-template.php @@ -781,7 +781,9 @@ function get_shortcut_link() { function site_url($path = '', $scheme = null) { // 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() ) $scheme = 'https'; |