From f4779576ec86643206c90f5867153ea2cb99df93 Mon Sep 17 00:00:00 2001 From: champsupertramp Date: Thu, 23 Jun 2016 19:20:54 +0800 Subject: [PATCH] Fix edit profile url in multi-site setup --- core/um-permalinks.php | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/core/um-permalinks.php b/core/um-permalinks.php index eeff46cf..e63253ab 100644 --- a/core/um-permalinks.php +++ b/core/um-permalinks.php @@ -70,7 +70,6 @@ class UM_Permalinks { $blog_id = get_current_blog_id(); $siteurl = get_site_url( $blog_id ); - if ( is_front_page() ) { $page_url = $siteurl; @@ -78,7 +77,21 @@ class UM_Permalinks { $page_url .= '?' . $_SERVER['QUERY_STRING']; } }else { - $page_url = $siteurl; + + if( $_SERVER[ $server_name_method ] == "localhost" ){ + + $page_url = 'http'; + + if ( isset( $_SERVER["HTTPS"] ) && $_SERVER["HTTPS"] == "on" ) { + $page_url .= "s"; + } + + $page_url .= "://"; + + $page_url .= $_SERVER[ $server_name_method ]; + }else{ + $page_url .= $siteurl; + } if ( $um_port_forwarding_url == 1 && isset( $_SERVER["SERVER_PORT"] ) ) { $page_url .= ":".$_SERVER["SERVER_PORT"].$_SERVER["REQUEST_URI"]; @@ -89,6 +102,7 @@ class UM_Permalinks { } + }else{ if ( !isset( $_SERVER['SERVER_NAME'] ) ) return '';