vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-08-12 12:50:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

More use of site_url(), admin_url(), and site_url(). Force login and admin links to be https if FORCE_SSL_LOGIN. see #7001

Browse Source 
git-svn-id: https://develop.svn.wordpress.org/trunk@8058 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Ryan Boren
2008-06-06 07:39:11 +00:00
parent 4e998bcdf2
commit 5d786d179c
8 changed files with 36 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wp-includes/link-template.php
+8 -4
View File
@@ -750,7 +750,7 @@ function get_shortcut_link() {
var k=d.getSelection;
var x=d.selection;
var s=(e?e():(k)?k():(x?x.createRange().text:0));
var f='" . get_settings('siteurl') . '/wp-admin/press-this.php' . "';
var f='" . admin_url('press-this.php') . "';
var l=d.location;
var e=encodeURIComponent;
var u= '?u=' + e(l.href);
@@ -779,8 +779,12 @@ function get_shortcut_link() {
// if $scheme is 'http' or 'https' it will override is_ssl()
function site_url($path = '', $scheme = null) {
// should the list of allowed schemes be maintained elsewhere?
if ( !in_array($scheme, array('http', 'https')) )
$scheme = ( is_ssl() ? 'https' : 'http' );
if ( !in_array($scheme, array('http', 'https')) ) {
if ( ('forceable' == $scheme) && (defined('FORCE_SSL_LOGIN') && FORCE_SSL_LOGIN) )
$scheme = 'https';
else
$scheme = ( is_ssl() ? 'https' : 'http' );
}
$url = str_replace( 'http://', "{$scheme}://", get_option('siteurl') );
@@ -793,7 +797,7 @@ function site_url($path = '', $scheme = null) {
function admin_url($path = '') {
global $_wp_admin_url;
$url = site_url() . '/wp-admin/';
$url = site_url('wp-admin/', 'forceable');
if ( !empty($path) && is_string($path) && strpos($path, '..') === false )
$url .= ltrim($path, '/');