| @@ -137,9 +137,11 @@ | ||
| 137 | 137 | return $url; // Nothing to do in this case. |
| 138 | 138 | |
| 139 | 139 | if(!in_array($scheme, array('http', 'https'), TRUE)) // If NOT explicit. |
| 140 | 140 | { |
| 141 | - if(($scheme === 'login_post' || $scheme === 'rpc') && (force_ssl_login() || force_ssl_admin())) | |
| 141 | + //260920.2009 On WP < 4.4, preserve legacy login-only SSL support via force_ssl_login(); on newer WP, avoid that deprecated helper and rely on force_ssl_admin(). | |
| 142 | + if(($scheme === 'login_post' || $scheme === 'rpc') | |
| 143 | + && ((version_compare($GLOBALS['wp_version'], '4.4', '<') && force_ssl_login()) || force_ssl_admin())) | |
| 142 | 144 | $scheme = 'https'; // Use an SSL scheme in this case. |
| 143 | 145 | |
| 144 | 146 | else if(($scheme === 'login' || $scheme === 'admin') && force_ssl_admin()) |
| 145 | 147 | $scheme = 'https'; // Use an SSL scheme in this case. |